summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2024-05-08 21:58:24 +0300
committerGeorge Hazan <george.hazan@gmail.com>2024-05-08 21:58:24 +0300
commit6c75142f5e14c3aef94474f9bea2f208f6a2c80b (patch)
treea0b693c5ce1866ff25bd55f759af839e7ee3796f /src
parentddbb0219762e420d1336af28aed918dc8b54dcfc (diff)
fixes #2870 (Tipper: при запуске Миранды под курсором возникает подсказка, словно курсор наведен на значок в трее)
Diffstat (limited to 'src')
-rw-r--r--src/mir_app/src/clisttray.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mir_app/src/clisttray.cpp b/src/mir_app/src/clisttray.cpp
index db28de042a..2ca5bef375 100644
--- a/src/mir_app/src/clisttray.cpp
+++ b/src/mir_app/src/clisttray.cpp
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
ITaskbarList3* pTaskbarInterface;
+static bool bIgnoreCallback = false;
static UINT WM_TASKBARCREATED;
static UINT WM_TASKBARBUTTONCREATED;
static UINT_PTR RefreshTimerId = 0;
@@ -63,7 +64,9 @@ static HICON lastTaskBarIcon;
static void SetTaskBarIcon(const HICON hIcon, const wchar_t *szNewTip)
{
if (pTaskbarInterface) {
+ bIgnoreCallback = true;
pTaskbarInterface->SetOverlayIcon(g_clistApi.hwndContactList, hIcon, szNewTip);
+ bIgnoreCallback = false;
lastTaskBarIcon = hIcon;
}
}
@@ -670,6 +673,9 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam)
break;
case TIM_CALLBACK:
+ if (bIgnoreCallback)
+ break;
+
if (msg->lParam == WM_RBUTTONDOWN || msg->lParam == WM_LBUTTONDOWN || msg->lParam == WM_RBUTTONDOWN && g_trayTooltipActive) {
Tipper_Hide();
g_trayTooltipActive = false;