From 10b7d7d68b568a27b18334853c87c4856ae464c7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 2 Mar 2023 13:57:34 +0300 Subject: =?UTF-8?q?fixes=20#3372=20(StdMsg:=20=D1=82=D0=BE=D0=BF=D0=B8?= =?UTF-8?q?=D0=BA=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B5=D1=80=D0=B5=D0=BD=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=B2=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=20?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/stdmsg/src/msgdialog.cpp | 35 +++++++++++++++++------------------ 1 file 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: -- cgit v1.2.3