diff options
| author | George Hazan <ghazan@miranda.im> | 2017-04-12 20:57:13 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-04-12 20:57:13 +0300 |
| commit | 99425cbfdcdee109c189ddd1d9d827eb0260c6f4 (patch) | |
| tree | 68f9f5b5abee87bbafd39fce783b364199791208 /src/core | |
| parent | c951935ab25197ce7c58716a339a010ba028f8e4 (diff) | |
fixes #797 (Contact windows no longer flashing)
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdmsg/src/chat_window.cpp | 5 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index a137c51998..d9114da0ae 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -1104,7 +1104,7 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_TIMER: if (wParam == TIMERID_FLASHWND) - FlashWindow(m_hwnd, TRUE); + FlashWindow(m_pOwner->GetHwnd(), TRUE); break; case WM_ACTIVATE: @@ -1133,11 +1133,12 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg != WM_ACTIVATE) SetFocus(m_message.GetHwnd()); + SendMessage(m_hwnd, DM_UPDATETITLE, 0, 0); pci->SetActiveSession(m_si); UpdateStatusBar(); if (KillTimer(m_hwnd, TIMERID_FLASHWND)) - FlashWindow(m_hwnd, FALSE); + FlashWindow(m_pOwner->GetHwnd(), FALSE); if (db_get_w(m_hContact, m_si->pszModule, "ApparentMode", 0) != 0) db_set_w(m_hContact, m_si->pszModule, "ApparentMode", 0); if (pcli->pfnGetEvent(m_hContact, 0)) diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 4a2d6db9ce..a39c109175 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1093,8 +1093,9 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) SetFocus(m_message.GetHwnd());
// fall through
case WM_MOUSEACTIVATE:
+ SendMessage(m_hwnd, DM_UPDATETITLE, 0, 0);
if (KillTimer(m_hwnd, TIMERID_FLASHWND))
- FlashWindow(m_hwnd, FALSE);
+ FlashWindow(m_pOwner->GetHwnd(), FALSE);
break;
case WM_GETMINMAXINFO:
@@ -1203,10 +1204,10 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_TIMER:
if (wParam == TIMERID_FLASHWND) {
- FlashWindow(m_hwnd, TRUE);
+ FlashWindow(m_pOwner->GetHwnd(), TRUE);
if (m_nFlash > 2 * g_dat.nFlashMax) {
KillTimer(m_hwnd, TIMERID_FLASHWND);
- FlashWindow(m_hwnd, FALSE);
+ FlashWindow(m_pOwner->GetHwnd(), FALSE);
m_nFlash = 0;
}
m_nFlash++;
@@ -1418,7 +1419,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) GetScrollInfo((HWND)lParam, SB_VERT, &si);
if ((si.nPos + (int)si.nPage + 5) >= si.nMax)
if (KillTimer(m_hwnd, TIMERID_FLASHWND))
- FlashWindow(m_hwnd, FALSE);
+ FlashWindow(m_pOwner->GetHwnd(), FALSE);
}
break;
}
|