ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RSHELL]

Browse Source 
* CMenuDeskBar: Use the submenu pointer to pass on the cancel events. Windows appears to call this with code=2 (cancellevel).
* CMenuBand: Begin implementing a focus manager for the menu windows. This class will take care of handling mouse and keyboard interactions, including closing the start menu and submenus when the user clicks outside the menu window.
CORE-7881

svn path=/branches/shell-experiments/; revision=62259
This commit is contained in:
David Quintana
2014-02-19 20:35:50 +00:00
parent b6207043c9
commit e0d383ebd4
3 changed files with 287 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/shell/rshell/CMenuDeskBar.cpp
+5 -8
View File
@@ -576,14 +576,11 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(
UIActivateIO(FALSE, NULL);
}
//if (bubbleUp && m_Site)
//{
// CComPtr<IMenuPopup> pmp;
// HRESULT hr = IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp));
// if (FAILED(hr))
// return hr;
// pmp->OnSelect(dwSelectType);
//}
if (bubbleUp && m_SubMenuParent)
{
hr = m_SubMenuParent->OnSelect(MPOS_CANCELLEVEL); // why??
return hr;
}
return S_OK;
}