diff options
| author | George Hazan <ghazan@miranda.im> | 2023-03-02 13:57:34 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-03-02 13:57:34 +0300 |
| commit | 10b7d7d68b568a27b18334853c87c4856ae464c7 (patch) | |
| tree | fbb4db396034d6e3f5d3a7ece47d55c4e0b4959a /src/core | |
| parent | e6715bd0de37c9fa94dffccebe08a35bda3aaacc (diff) | |
fixes #3372 (StdMsg: топик конференции в статус баре)
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 84ba0e1ca1..aebdb9ee81 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -410,24 +410,22 @@ void CMsgDialog::OnType(CTimer*) m_bShowTyping = false;
}
}
- else {
- if (m_nTypeSecs) {
- HICON hTyping = Skin_LoadIcon(SKINICON_OTHER_TYPING);
-
- wchar_t szBuf[256];
- mir_snwprintf(szBuf, TranslateT("%s is typing a message..."),
- (m_pUserTyping) ? m_pUserTyping->pszNick : Clist_GetContactDisplayName(m_hContact));
- m_nTypeSecs--;
-
- SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)szBuf);
- SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hTyping);
- if (g_plugin.bShowTypingWin && GetForegroundWindow() != m_pOwner->GetHwnd()) {
- HICON hIcon = (HICON)SendMessage(m_hwnd, WM_GETICON, ICON_SMALL, 0);
- SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hTyping);
- IcoLib_ReleaseIcon(hIcon);
- }
- m_bShowTyping = true;
+ else if (m_nTypeSecs) {
+ HICON hTyping = Skin_LoadIcon(SKINICON_OTHER_TYPING);
+
+ wchar_t szBuf[256];
+ mir_snwprintf(szBuf, TranslateT("%s is typing a message..."),
+ (m_pUserTyping) ? m_pUserTyping->pszNick : Clist_GetContactDisplayName(m_hContact));
+ m_nTypeSecs--;
+
+ SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)szBuf);
+ SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hTyping);
+ if (g_plugin.bShowTypingWin && GetForegroundWindow() != m_pOwner->GetHwnd()) {
+ HICON hIcon = (HICON)SendMessage(m_hwnd, WM_GETICON, ICON_SMALL, 0);
+ SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hTyping);
+ IcoLib_ReleaseIcon(hIcon);
}
+ m_bShowTyping = true;
}
}
@@ -805,7 +803,8 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) break;
case DM_STATUSICONCHANGE:
- SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, (SBT_OWNERDRAW | (SendMessage(m_pOwner->m_hwndStatus, SB_GETPARTS, 0, 0) - 1)), 0);
+ if (!isChat())
+ SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, (SBT_OWNERDRAW | (SendMessage(m_pOwner->m_hwndStatus, SB_GETPARTS, 0, 0) - 1)), 0);
break;
case WM_KEYDOWN:
|