diff options
| -rw-r--r-- | plugins/TabSRMM/src/chat_window.cpp | 3 | ||||
| -rw-r--r-- | src/core/stdmsg/src/chat_window.cpp | 9 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp index 9d7c6f9211..6dd8682774 100644 --- a/plugins/TabSRMM/src/chat_window.cpp +++ b/plugins/TabSRMM/src/chat_window.cpp @@ -1932,13 +1932,12 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) break; case WM_ACTIVATE: + case WM_MOUSEACTIVATE: if (LOWORD(wParam) != WA_ACTIVE) { m_pContainer->hwndSaved = nullptr; break; } - __fallthrough; - case WM_MOUSEACTIVATE: UpdateWindowState(WM_ACTIVATE); return 1; diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index c8e23c46b8..459bb6575d 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -1101,15 +1101,6 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) } break; - case WM_ACTIVATE: - if (LOWORD(wParam) == WA_INACTIVE) { - if (g_Settings.bTabsEnable) { - m_si->wState &= ~GC_EVENT_HIGHLIGHT; - m_si->wState &= ~STATE_TALK; - } - } - break; - case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) { case EN_MSGFILTER: diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index b189320ce3..ce7bf0d7c5 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -680,6 +680,13 @@ INT_PTR CSrmmBaseDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) } break; + case WM_ACTIVATE: + if (m_si && LOWORD(wParam) == WA_INACTIVE) { + m_si->wState &= ~GC_EVENT_HIGHLIGHT; + m_si->wState &= ~STATE_TALK; + } + break; + case WM_CBD_RECREATE: Srmm_CreateToolbarIcons(m_hwnd, isChat() ? BBBF_ISCHATBUTTON : BBBF_ISIMBUTTON); break; |