From 2654e0d0443d3d66cc18e3f9923e667013b17f07 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 16 Feb 2022 18:13:56 +0300
Subject: fixes #3028 (tabSRMM, Scriver: cannot toggle event filter by Ctrl+F)
---
plugins/Scriver/src/msgdialog.cpp | 7 ++++++-
plugins/TabSRMM/src/msgdialog.cpp | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index cb898c9107..024c43fe97 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -887,8 +887,10 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
replaceStrW(m_wszSearchResult, nullptr);
}
- if (ProcessHotkeys(wParam, isShift, isCtrl, isAlt))
+ if (wParam == 0x46 && isCtrl && !isAlt) { // ctrl-f (toggle filter)
+ m_btnFilter.Click();
return TRUE;
+ }
if (wParam == 0x4e && isCtrl && !isAlt) { // ctrl-n (nicklist)
if (m_btnNickList.Enabled())
@@ -906,6 +908,9 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
m_btnChannelMgr.Click();
return TRUE;
}
+
+ if (ProcessHotkeys(wParam, isShift, isCtrl, isAlt))
+ return TRUE;
}
break;
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 92c03c4464..4ffdebbc4e 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1407,14 +1407,14 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
switch (mim_hotkey_check) {
case TABSRMM_HK_CHANNELMGR:
- onClick_ChanMgr(&m_btnChannelMgr);
+ m_btnChannelMgr.Click();
return _dlgReturn(m_hwnd, 1);
case TABSRMM_HK_FILTERTOGGLE:
- onClick_Filter(&m_btnFilter);
+ m_btnFilter.Click();
InvalidateRect(m_btnFilter.GetHwnd(), nullptr, TRUE);
return _dlgReturn(m_hwnd, 1);
case TABSRMM_HK_LISTTOGGLE:
- onClick_ShowNickList(&m_btnNickList);
+ m_btnNickList.Click();
return _dlgReturn(m_hwnd, 1);
case TABSRMM_HK_MUC_SHOWSERVER:
if (m_si->iType != GCW_SERVER)
--
cgit v1.2.3