Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[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.

Browse source 
svn path=/trunk/; revision=74968
This commit is contained in:
Giannis Adamopoulos 2017-06-08 20:31:49 +00:00
parent 1ac1c1b261
commit 8ad0eae687
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/base/shell/explorer/taskswnd.cpp
View file

@ -1403,11 +1403,8 @@ public:
case HSHELL_RUDEAPPACTIVATED: case HSHELL_RUDEAPPACTIVATED:
case HSHELL_WINDOWACTIVATED: case HSHELL_WINDOWACTIVATED:
if (lParam) ActivateTask((HWND) lParam);
{ Ret = TRUE;
ActivateTask((HWND) lParam);
Ret = TRUE;
}
break; break;
case HSHELL_FLASH: case HSHELL_FLASH:
@ -1797,6 +1794,11 @@ public:
return FALSE; 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) LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
#if DUMP_TASKS != 0 #if DUMP_TASKS != 0
@ -1844,6 +1846,8 @@ public:
MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(WM_SETFONT, OnSetFont)
MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged)
MESSAGE_HANDLER(m_ShellHookMsg, HandleShellHookMsg) MESSAGE_HANDLER(m_ShellHookMsg, HandleShellHookMsg)
MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate)
MESSAGE_HANDLER(WM_KLUDGEMINRECT, OnKludgeItemRect)
END_MSG_MAP() END_MSG_MAP()
HWND _Init(IN HWND hWndParent, IN OUT ITrayWindow *tray) HWND _Init(IN HWND hWndParent, IN OUT ITrayWindow *tray)