From 8ad0eae6879029219ce3b62b554869a9d33aefa9 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Thu, 8 Jun 2017 20:31:49 +0000 Subject: [PATCH] [EXPLORER] -Revert a hack from r63304 that caused CORE-13388. This hid another bug and the correct way to fix this is to return MA_NOACTIVATE to WM_MOUSEACTIVATE. svn path=/trunk/; revision=74968 --- reactos/base/shell/explorer/taskswnd.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/reactos/base/shell/explorer/taskswnd.cpp b/reactos/base/shell/explorer/taskswnd.cpp index 1dd2bf5ef2c..b5325acee99 100644 --- a/reactos/base/shell/explorer/taskswnd.cpp +++ b/reactos/base/shell/explorer/taskswnd.cpp @@ -1403,11 +1403,8 @@ public: case HSHELL_RUDEAPPACTIVATED: case HSHELL_WINDOWACTIVATED: - if (lParam) - { - ActivateTask((HWND) lParam); - Ret = TRUE; - } + ActivateTask((HWND) lParam); + Ret = TRUE; break; case HSHELL_FLASH: @@ -1797,6 +1794,11 @@ public: return FALSE; } + LRESULT OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + return MA_NOACTIVATE; + } + LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { #if DUMP_TASKS != 0 @@ -1844,6 +1846,8 @@ public: MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) MESSAGE_HANDLER(m_ShellHookMsg, HandleShellHookMsg) + MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate) + MESSAGE_HANDLER(WM_KLUDGEMINRECT, OnKludgeItemRect) END_MSG_MAP() HWND _Init(IN HWND hWndParent, IN OUT ITrayWindow *tray)