diff options
| author | George Hazan <ghazan@miranda.im> | 2018-06-14 16:26:02 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-06-14 16:26:02 +0300 |
| commit | 2b5922a413634e236585bc9039450974f8ab2268 (patch) | |
| tree | f2ef387b4a0c9ca5dbe0395fc6be1d3be6bde31f /src | |
| parent | 2723a75e981a2998c2243586c0214dd73d7e3874 (diff) | |
chat behaviour unification: if a window isn't closed, but only minimized, clist extra icon gets enabled again when a new message comes (till window gets focused)
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/chat_window.cpp | 9 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 7 |
2 files changed, 7 insertions, 9 deletions
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; |