Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-22 21:30:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Workaround for the exec issue. Ros currently seems to send a bogus WM_ACTIVATE message when clicking while the window is already active. Proper fix may come later if I can figure out why this happens.

CORE-7586

svn path=/branches/shell-experiments/; revision=62475
This commit is contained in:
David Quintana 2014-03-11 17:40:18 +00:00
parent 683375abdb
commit 905eb2bdce
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
base/shell/rshell/CMenuDeskBar.cpp
View file

@ -491,7 +491,7 @@ HRESULT CMenuDeskBar::_CloseBar()
if (FAILED_UNEXPECTEDLY(hr))
return hr;
SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
SetWindowPos(NULL, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE);
return UIActivateIO(FALSE, NULL);
}
@ -609,8 +609,13 @@ LRESULT CMenuDeskBar::_OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bH
LRESULT CMenuDeskBar::_OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
if (wParam != 0)
DbgPrint("BaseBar %08p (de)activated (%08x, %08x).\n", m_hWnd, wParam, lParam);
// BUG in ReactOS: WM_ACTIVATE/WA_INACTIVE makes no sense with lParam==hWnd
if (LOWORD(wParam) != 0 || reinterpret_cast<HWND>(lParam) == m_hWnd)
{
return 0;
}
// HACK! I just want it to work !!!
CComPtr<IDeskBar> db;