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

[RSHELL]

Browse source 
* Fix the hot tracking on the filebrowser menubar. Still does not handle switching menus while hovering, though.
CORE-7586

svn path=/branches/shell-experiments/; revision=62514
This commit is contained in:
David Quintana 2014-03-16 09:28:51 +00:00
parent ea3e04f67f
commit aa699bf2a9
4 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
base/shell/rshell/CMenuFocusManager.cpp
View file

@ -105,7 +105,7 @@ HRESULT CMenuFocusManager::PeekArray(CMenuBand ** pItem)
*pItem = NULL;
if (m_bandCount <= 0)
return E_FAIL;
return S_FALSE;
*pItem = m_bandStack[m_bandCount - 1];
@ -115,10 +115,10 @@ HRESULT CMenuFocusManager::PeekArray(CMenuBand ** pItem)
CMenuFocusManager::CMenuFocusManager() :
m_currentBand(NULL),
m_currentFocus(NULL),
m_bandCount(0),
m_mouseTrackDisabled(FALSE),
m_lastMoveFlags(0),
m_lastMovePos(0)
m_lastMovePos(0),
m_bandCount(0)
{
m_threadId = GetCurrentThreadId();
}
@ -318,6 +318,8 @@ HRESULT CMenuFocusManager::UpdateFocus(CMenuBand * newBand)
if (newBand == NULL)
{
DisableMouseTrack(NULL, FALSE);
hr = RemoveHooks(m_currentFocus);
m_currentFocus = NULL;
m_currentBand = NULL;