mirror of
https://github.com/reactos/reactos.git
synced 2024-07-05 04:06:22 +00:00
[RSHELL]
* Fix keyboard navigation on vertical popup menus. Navigating through the menubar does not work yet. CORE-7586 svn path=/branches/shell-experiments/; revision=62753
This commit is contained in:
parent
ba203171e1
commit
5e4427d973
|
@ -809,16 +809,16 @@ HRESULT CMenuBand::_KeyboardItemChange(DWORD change)
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
// Select the second toolbar based on the first
|
// Select the second toolbar based on the first
|
||||||
if (tb == m_SFToolbar)
|
if (tb == m_SFToolbar && m_staticToolbar)
|
||||||
tb = m_staticToolbar;
|
tb = m_staticToolbar;
|
||||||
else
|
else if (m_SFToolbar)
|
||||||
tb = m_SFToolbar;
|
tb = m_SFToolbar;
|
||||||
|
|
||||||
if (!tb)
|
if (!tb)
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
// Ask the second toolbar to change
|
// Ask the second toolbar to change
|
||||||
return tb->KeyboardItemChange(change == VK_DOWN ? VK_END : VK_HOME);
|
return tb->KeyboardItemChange(change == VK_DOWN ? VK_HOME : VK_END);
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
|
HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
|
||||||
|
|
|
@ -913,7 +913,7 @@ HRESULT CMenuToolbarBase::KeyboardItemChange(DWORD dwSelectType)
|
||||||
if (prev != btn.idCommand)
|
if (prev != btn.idCommand)
|
||||||
{
|
{
|
||||||
TRACE("Setting Hot item to %d\n", index);
|
TRACE("Setting Hot item to %d\n", index);
|
||||||
m_menuBand->_ChangeHotItem(this, index, 0);
|
m_menuBand->_ChangeHotItem(this, btn.idCommand, 0);
|
||||||
}
|
}
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
@ -927,6 +927,8 @@ HRESULT CMenuToolbarBase::KeyboardItemChange(DWORD dwSelectType)
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return S_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prev != -1)
|
if (prev != -1)
|
||||||
|
|
Loading…
Reference in a new issue