Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-18 07:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Make use of the CToolbar class here too.
* Fix the menubar logic for closing menus on a second click. Almost. There's some glitch when clicking too fast, that I will fix later.

svn path=/branches/shell-experiments/; revision=65373
This commit is contained in:
David Quintana 2014-11-11 01:05:39 +00:00
parent eae27787e5
commit 4f5c586905
8 changed files with 260 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

13
base/shell/rshell/CMenuBand.cpp
View file

@ -389,14 +389,14 @@ HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow)
if (m_staticToolbar != NULL)
{
hr = m_staticToolbar->ShowWindow(fShow);
hr = m_staticToolbar->ShowDW(fShow);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
}
if (m_SFToolbar != NULL)
{
hr = m_SFToolbar->ShowWindow(fShow);
hr = m_SFToolbar->ShowDW(fShow);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
}
@ -1061,6 +1061,15 @@ HRESULT CMenuBand::_OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RE
return S_OK;
}
HRESULT CMenuBand::_BeforeCancelPopup()
{
if (m_staticToolbar)
m_staticToolbar->BeforeCancelPopup();
if (m_SFToolbar)
m_SFToolbar->BeforeCancelPopup();
return S_OK;
}
HRESULT CMenuBand::_DisableMouseTrack(BOOL bDisable)
{
if (m_staticToolbar)