there's no need to make FilterWndProc a class member anymore

4 files changed, 51 insertions, 46 deletions

diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index c901b0a2ec..465fb649b2 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -32,52 +32,15 @@ void CMsgDialog::LoadSettings()
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-void CMsgDialog::ShowFilterMenu()

-{

-	HWND hwnd = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);

-	TranslateDialogDefault(hwnd);

-

-	RECT rc;

-	GetWindowRect(m_btnFilter.GetHwnd(), &rc);

-	SetWindowPos(hwnd, HWND_TOP, rc.left - 85, (IsWindowVisible(m_btnFilter.GetHwnd()) || IsWindowVisible(m_btnBold.GetHwnd())) ? rc.top - 206 : rc.top - 186, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);

-}

-

-void CMsgDialog::UpdateFilterButton()

-{

-	CSuper::UpdateFilterButton();

-

-	m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER : IDI_FILTER2));

-	m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST : IDI_NICKLIST2, FALSE));

-}

-

-void CMsgDialog::UpdateStatusBar()

-{

-	wchar_t *ptszDispName = m_si->pMI->ptszModDispName;

-	int x = 12;

-	x += Chat_GetTextPixelSize(ptszDispName, (HFONT)SendMessage(m_pOwner->m_hwndStatus, WM_GETFONT, 0, 0), TRUE);

-	x += GetSystemMetrics(SM_CXSMICON);

-	int iStatusbarParts[2] = { x, -1 };

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETPARTS, 2, (LPARAM)&iStatusbarParts);

-

-	HICON hIcon = ImageList_GetIcon(Clist_GetImageList(), GetImageId(), ILD_TRANSPARENT);

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);

-	DestroyIcon(hIcon);

-

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)ptszDispName);

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETTIPTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));

-}

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

-INT_PTR CALLBACK CMsgDialog::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

 	int iFlags;

-	static CMsgDialog *pDlg = nullptr;

+	auto *pDlg = (CMsgDialog*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 

 	switch (uMsg) {

 	case WM_INITDIALOG:

-		pDlg = (CMsgDialog*)lParam;

+		pDlg = (CMsgDialog *)lParam;

+		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

 		iFlags = db_get_dw(pDlg->m_hContact, CHAT_MODULE, "FilterFlags");

 		CheckDlgButton(hwndDlg, IDC_1, iFlags & GC_EVENT_ACTION ? BST_CHECKED : BST_UNCHECKED);

@@ -139,9 +102,48 @@ INT_PTR CALLBACK CMsgDialog::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
 		break;

 

 	case WM_CLOSE:

+		pDlg->m_hwndFilter = nullptr;

 		DestroyWindow(hwndDlg);

 		break;

 	}

 

 	return FALSE;

 }

+

+void CMsgDialog::ShowFilterMenu()

+{

+	m_hwndFilter = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);

+	TranslateDialogDefault(m_hwndFilter);

+

+	RECT rc;

+	GetWindowRect(m_btnFilter.GetHwnd(), &rc);

+	SetWindowPos(m_hwndFilter, HWND_TOP, rc.left - 85, (IsWindowVisible(m_btnFilter.GetHwnd()) || IsWindowVisible(m_btnBold.GetHwnd())) ? rc.top - 206 : rc.top - 186, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

+void CMsgDialog::UpdateFilterButton()

+{

+	CSuper::UpdateFilterButton();

+

+	m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER : IDI_FILTER2));

+	m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST : IDI_NICKLIST2, FALSE));

+}

+

+void CMsgDialog::UpdateStatusBar()

+{

+	wchar_t *ptszDispName = m_si->pMI->ptszModDispName;

+	int x = 12;

+	x += Chat_GetTextPixelSize(ptszDispName, (HFONT)SendMessage(m_pOwner->m_hwndStatus, WM_GETFONT, 0, 0), TRUE);

+	x += GetSystemMetrics(SM_CXSMICON);

+	int iStatusbarParts[2] = { x, -1 };

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETPARTS, 2, (LPARAM)&iStatusbarParts);

+

+	HICON hIcon = ImageList_GetIcon(Clist_GetImageList(), GetImageId(), ILD_TRANSPARENT);

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);

+	DestroyIcon(hIcon);

+

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)ptszDispName);

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETTIPTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));

+}

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 79de2343a0..ef9cf07067 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -273,8 +273,12 @@ void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
 

 	if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)

 		ShowFilterMenu();

-	else

+	else {

+		if (m_hwndFilter)

+			SendMessage(m_hwndFilter, WM_CLOSE, 0, 0);

+

 		RedrawLog();

+	}

 }

 

 void CMsgDialog::onClick_NickList(CCtrlButton *pButton)

diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index 9e72103eac..66e580ec5f 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -43,8 +43,6 @@ class CMsgDialog : public CSrmmBaseDialog
 	void UpdateIcon(WPARAM wParam);

 	void UpdateLastMessage(void);

 

-	static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

-

 	CCtrlBase m_avatar;

 	

 	void OnFlash(CTimer *);

@@ -125,6 +123,7 @@ public:
 	bool m_bIsAutoRTL = false;

 	HBITMAP m_avatarPic = 0;

 	wchar_t *m_wszInitialText = 0;

+	MWindow m_hwndFilter;

 

 	int GetImageId() const;

 

diff --git a/src/mir_app/src/srmm_main.cpp b/src/mir_app/src/srmm_main.cpp
index c033ade4df..f990f86be3 100644
--- a/src/mir_app/src/srmm_main.cpp
+++ b/src/mir_app/src/srmm_main.cpp
@@ -184,9 +184,9 @@ static HOTKEYDESC srmmHotkeys[] = {
 	{ "srmm_bkcolor",  LPGEN("Toggle back color"),           BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'L'), 0, SRMM_HK_BKCOLOR },
 	{ "srmm_clear",    LPGEN("Clear formatting"),            BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, VK_SPACE), 0, SRMM_HK_CLEAR },
 	{ "srmm_history",  LPGEN("Open history window"),         BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'H'), 0, SRMM_HK_HISTORY},
-	{ "srmm_cmgr",     LPGEN("Channel manager"),             BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'O'), 0, SRMM_HK_CHANNELMGR },
-	{ "srmm_filter",   LPGEN("Toggle filter"),               BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'F'), 0, SRMM_HK_FILTERTOGGLE },
+	{ "srmm_filter",   LPGEN("Toggle filter"),               BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'F'), 0, SRMM_HK_FILTERTOGGLE },
 	{ "srmm_nicklist", LPGEN("Toggle nick list"),            BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'N'), 0, SRMM_HK_LISTTOGGLE },
+	{ "srmm_cmgr",     LPGEN("Channel manager"),             BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'O'), 0, SRMM_HK_CHANNELMGR },
 };
 
 int LoadSrmmModule()