* CMenuBand: Send timer notifications for all items, so we can hide a previous submenu when the user hovers an item without submenu.
* CMenuBand: Avoid a stack overflow in some versions of windows by relying on the stored value instead of asking for it in the middle of a changed event.
CORE-7881
svn path=/branches/shell-experiments/; revision=62303
case WM_TIMER:
if (wParam == TIMERID_HOTTRACK)
{
case WM_TIMER:
if (wParam == TIMERID_HOTTRACK)
{
- m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL);
- PopupItem(m_hotItem);
KillTimer(hWnd, TIMERID_HOTTRACK);
KillTimer(hWnd, TIMERID_HOTTRACK);
+
+ m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL);
+
+ if (HasSubMenu(m_hotItem) == S_OK)
+ {
+ PopupItem(m_hotItem);
+ }
}
else if (m_hotItem != hot->idNew)
{
}
else if (m_hotItem != hot->idNew)
{
- if (HasSubMenu(hot->idNew) == S_OK)
- {
- DWORD elapsed = 0;
- SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0);
- SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL);
- }
+ DWORD elapsed = 0;
+ SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0);
+ SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL);
m_hotItem = hot->idNew;
m_menuBand->_OnHotItemChanged(this, m_hotItem);
m_hotItem = hot->idNew;
m_menuBand->_OnHotItemChanged(this, m_hotItem);
HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType)
{
HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType)
{
- int prev = SendMessage(m_hwnd, TB_GETHOTITEM, 0, 0);
int index = -1;
if (dwSelectType != 0xFFFFFFFF)
int index = -1;
if (dwSelectType != 0xFFFFFFFF)
if (btn.dwData)
{
m_hotItem = btn.idCommand;
if (btn.dwData)
{
m_hotItem = btn.idCommand;
{
SendMessage(m_hwnd, TB_SETHOTITEM, index, 0);
return m_menuBand->_OnHotItemChanged(this, m_hotItem);
{
SendMessage(m_hwnd, TB_SETHOTITEM, index, 0);
return m_menuBand->_OnHotItemChanged(this, m_hotItem);
{
SendMessage(m_hwnd, TB_SETHOTITEM, -1, 0);
m_menuBand->_OnHotItemChanged(NULL, -1);
{
SendMessage(m_hwnd, TB_SETHOTITEM, -1, 0);
m_menuBand->_OnHotItemChanged(NULL, -1);