From 46de3a22acc964f27a5260e144089125f83586ff Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Fri, 23 Sep 2022 08:25:27 +0900 Subject: [PATCH] [EXPLORER] Follow-up of #4718 (ba2cead) Handle click OnNcLButtonUp instead of OnNcLButtonDown/OnNcLButtonDblClick. CORE-15369 --- base/shell/explorer/traywnd.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index b3384a4dc06..2b648e80568 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2861,9 +2861,6 @@ ChangePos: bHandled = FALSE; - if (CheckShowDesktopButtonClick(lParam, bHandled)) - return TRUE; - RECT rcStartBtn; m_StartButton.GetWindowRect(&rcStartBtn); @@ -3038,9 +3035,6 @@ HandleTrayContextMenu: LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (CheckShowDesktopButtonClick(lParam, bHandled)) - return TRUE; - /* Let the clock handle the double click */ ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); @@ -3049,6 +3043,14 @@ HandleTrayContextMenu: return TRUE; } + LRESULT OnNcLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (CheckShowDesktopButtonClick(lParam, bHandled)) + return 0; + + return 0; + } + LRESULT OnAppTrayDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { DestroyWindow(); @@ -3423,6 +3425,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_SYSCHAR, OnSysChar) MESSAGE_HANDLER(WM_NCRBUTTONUP, OnNcRButtonUp) MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick) + MESSAGE_HANDLER(WM_NCLBUTTONUP, OnNcLButtonUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_NCMOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy)