From aa23f64e684fd892a2ae51eacb71c66434efc4d0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Sep 2023 13:11:32 +0300 Subject: minor code unification --- src/core/stdmsg/src/chat_window.cpp | 4 ---- src/mir_app/src/srmm_base.cpp | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index 5513da517d..08762670c6 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -52,16 +52,12 @@ void CMsgDialog::UpdateFilterButton() void CMsgDialog::UpdateOptions() { - UpdateFilterButton(); - HICON hIcon = ImageList_GetIcon(Clist_GetImageList(), GetImageId(), ILD_TRANSPARENT); SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon); DestroyIcon(hIcon); Window_SetIcon_IcoLib(m_pOwner->GetHwnd(), g_plugin.getIconHandle(IDI_CHANMGR)); - m_pLog->UpdateOptions(); - // nicklist int ih = Chat_GetTextPixelSize(L"AQGglo", g_Settings.UserListFont, FALSE); int ih2 = Chat_GetTextPixelSize(L"AQGglo", g_Settings.UserListHeadingsFont, FALSE); diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index abd760fa97..499bf58b67 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -639,6 +639,9 @@ bool CSrmmBaseDialog::IsSuitableEvent(const LOGINFO &lin) const void CSrmmBaseDialog::UpdateOptions() { + m_pLog->UpdateOptions(); + UpdateFilterButton(); + MODULEINFO *mi = m_si->pMI; EnableWindow(m_btnBold.GetHwnd(), mi->bBold); EnableWindow(m_btnItalic.GetHwnd(), mi->bItalics); @@ -736,7 +739,9 @@ void CSrmmBaseDialog::UpdateFilterButton() if (m_si) Chat_SetFilters(m_si); - m_btnFilter.SendMsg(BUTTONADDTOOLTIP, (WPARAM)(m_bFilterEnabled ? TranslateT("Disable the event filter (Ctrl+F)") : TranslateT("Enable the event filter (Ctrl+F)")), BATF_UNICODE); + m_btnFilter.SendMsg(BUTTONADDTOOLTIP, (WPARAM)(m_bFilterEnabled + ? TranslateT("Disable the event filter (Ctrl+F)") + : TranslateT("Enable the event filter (Ctrl+F)")), BATF_UNICODE); } ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3