* Prevent the focused window from receiving keyboard events while a shell menu is open.
CORE-7586

svn path=/branches/shell-experiments/; revision=62935
This commit is contained in:
David Quintana 2014-04-24 11:25:46 +00:00
parent 78790baf2e
commit 663bc1da24
4 changed files with 20 additions and 2 deletions

View file

@ -814,9 +814,16 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theRe
*theResult = 0;
INT iItem = (INT)wParam;
return ExecuteItem(iItem);
}
HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
{
m_menuBand->_KillPopupTimers();
if (PopupItem(wParam) == S_OK)
if (PopupItem(iItem) == S_OK)
{
TRACE("PopupItem returned S_OK\n");
return S_FALSE;
@ -829,7 +836,6 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theRe
if (FAILED_UNEXPECTEDLY(hr))
return hr;
INT iItem = wParam;
INT index;
DWORD_PTR data;