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

[RSHELL]

Browse source 
* Implemented horizontal keyboard navigation on the menubar. Does not yet work for the Favorites menu, which is a shell popup and not a tracked popup. Also missing the system menu in the rotation.

svn path=/branches/shell-experiments/; revision=62757
This commit is contained in:
David Quintana 2014-04-16 12:14:02 +00:00
parent 9c589bb131
commit dc8f232870
3 changed files with 61 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -793,13 +793,21 @@ HRESULT CMenuBand::_KeyboardItemChange(DWORD change)
if (!tb)
{
// If no hot item was selected
// choose the first toolbar (prefer shell-folder, which will be positioned at the top)
if (m_SFToolbar)
tb = m_SFToolbar;
else
tb = m_staticToolbar;
// If no hot item was selected choose the appropriate toolbar
if (change == VK_UP)
{
if (m_staticToolbar)
tb = m_staticToolbar;
else
tb = m_SFToolbar;
}
else if (change == VK_DOWN)
{
if (m_SFToolbar)
tb = m_SFToolbar;
else
tb = m_staticToolbar;
}
}
// Ask the first toolbar to change
@ -861,20 +869,19 @@ HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
switch (changeType)
{
case MPOS_SELECTLEFT:
if (m_parentBand && m_parentBand->_IsPopup()==S_FALSE)
return m_parentBand->_MenuItemHotTrack(VK_LEFT);
if (m_subMenuChild)
return m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
if (!m_subMenuParent)
{
if (m_subMenuChild)
return m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
return S_OK;
}
return m_subMenuParent->OnSelect(MPOS_CANCELLEVEL);
case MPOS_SELECTRIGHT:
if (m_hotBar && m_hotItem >= 0)
{
if (m_hotBar->PopupItem(m_hotItem) == S_OK)
return S_FALSE;
}
if (m_hotBar && m_hotItem >= 0 && m_hotBar->PopupItem(m_hotItem) == S_OK)
return S_FALSE;
if (m_parentBand)
return m_parentBand->_MenuItemHotTrack(VK_RIGHT);
if (!m_subMenuParent)
return S_OK;
return m_subMenuParent->OnSelect(MPOS_SELECTRIGHT);