From 00f13b022dbf89fd630a8d43ffd602c84caff7e9 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 20 Mar 2023 18:20:03 +0300
Subject: =?UTF-8?q?fixes=20#3443=20(=D0=9C=D0=B5=D0=BD=D1=8F=D1=82=D1=8C?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D0=BA=D1=83=20?=
 =?UTF-8?q?=D0=BA=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D1=83=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/Scriver/src/msgdialog.cpp   | 3 ++-
 plugins/Scriver/src/msgs.h          | 1 +
 plugins/Scriver/src/msgutils.cpp    | 9 ++++++++-
 plugins/TabSRMM/src/msgdialog.cpp   | 2 +-
 plugins/TabSRMM/src/msgdlgother.cpp | 9 ++++++++-
 plugins/TabSRMM/src/msgs.h          | 1 +
 6 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 78ab1229ee..b5ab5506ea 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -502,7 +502,8 @@ void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
 		return;
 
 	m_bFilterEnabled = !m_bFilterEnabled;
-	pButton->SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER2 : IDI_FILTER));
+	UpdateFilterButton();
+
 	if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)
 		ShowFilterMenu();
 	else
diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 30c228f101..44d53eebd6 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -177,6 +177,7 @@ public:
 	void LoadSettings() override;
 	void SetStatusText(const wchar_t *, HICON) override;
 	void ShowFilterMenu() override;
+	void UpdateFilterButton() override;
 	void UpdateNickList() override;
 	void UpdateOptions() override;
 	void UpdateStatusBar() override;
diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp
index 4df469e568..7d659b85bd 100644
--- a/plugins/Scriver/src/msgutils.cpp
+++ b/plugins/Scriver/src/msgutils.cpp
@@ -530,6 +530,13 @@ void CMsgDialog::UpdateIcon()
 	SendDlgItemMessage(m_hwnd, IDC_USERMENU, BM_SETIMAGE, IMAGE_ICON, (LPARAM)m_hStatusIcon);
 }
 
+void CMsgDialog::UpdateFilterButton()
+{
+	CSuper::UpdateFilterButton();
+
+	m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER2 : IDI_FILTER));
+}
+
 void CMsgDialog::UpdateNickList()
 {
 	m_nickList.SetDraw(false);
@@ -552,10 +559,10 @@ void CMsgDialog::UpdateNickList()
 void CMsgDialog::UpdateOptions()
 {
 	m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST2 : IDI_NICKLIST));
-	m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER2 : IDI_FILTER));
 
 	GetAvatar();
 
+	UpdateFilterButton();
 	UpdateStatusBar();
 	UpdateTitle();
 	FixTabIcons();
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 0c0e1257be..9088f3c08d 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -996,7 +996,7 @@ void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
 		return;
 
 	m_bFilterEnabled = !m_bFilterEnabled;
-	m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);
+	UpdateFilterButton();
 
 	if (m_bFilterEnabled && !g_chatApi.bRightClickFilter) 
 		ShowFilterMenu();
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 88f6e5d735..b2e293ab74 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -2485,6 +2485,13 @@ int CMsgDialog::Typing(int secs)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+void CMsgDialog::UpdateFilterButton()
+{
+	CSuper::UpdateFilterButton();
+
+	m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);
+}
+
 void CMsgDialog::UpdateNickList()
 {
 	int i = m_nickList.SendMsg(LB_GETTOPINDEX, 0, 0);
@@ -2506,7 +2513,7 @@ void CMsgDialog::UpdateOptions()
 	m_nickList.SetItemHeight(0, g_Settings.iNickListFontHeight);
 	InvalidateRect(m_nickList.GetHwnd(), nullptr, TRUE);
 
-	m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);
+	UpdateFilterButton();
 
 	CSuper::UpdateOptions();
 }
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 8f0082470a..15bbd42352 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -637,6 +637,7 @@ public:
 	void LoadSettings() override;
 	void SetStatusText(const wchar_t *, HICON) override;
 	void ShowFilterMenu() override;
+	void UpdateFilterButton() override;
 	void UpdateNickList() override;
 	void UpdateOptions() override;
 	void UpdateStatusBar() override;
-- 
cgit v1.2.3