Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-29 11:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Implement WH_MSGFILTER hooking to handle the popup menus from the horizontal menubar. Switching between menu items wby moving the mouse now works, but at the moment, the non-menu popups (including the start menu) are somewhat glitchy.
CORE-7586

svn path=/branches/shell-experiments/; revision=62534
This commit is contained in:
David Quintana 2014-03-19 15:33:41 +00:00
parent 64227df624
commit ad40525f61
8 changed files with 273 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

63
base/shell/rshell/CMenuToolbars.cpp
View file

@ -197,7 +197,8 @@ CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) :
m_hasIdealSize(FALSE),
m_usePager(usePager),
m_hotItem(-1),
m_popupItem(-1)
m_popupItem(-1),
m_isTracking(FALSE)
{
m_marlett = CreateFont(
0, 0, 0, 0, 0, 0, 0, 0, DEFAULT_CHARSET,
@ -401,6 +402,14 @@ LRESULT CMenuToolbarBase::SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
switch (uMsg)
{
case WM_USER_ISTRACKEDITEM:
m_SubclassOld(hWnd, uMsg, wParam, lParam);
return IsTrackedItem(wParam);
case WM_USER_CHANGETRACKEDITEM:
m_isTracking = TRUE;
m_SubclassOld(hWnd, uMsg, wParam, lParam);
return ChangeTrackedItem(wParam);
case WM_COMMAND:
OnWinEvent(hWnd, uMsg, wParam, lParam, &lr);
break;
@ -461,6 +470,18 @@ HRESULT CMenuToolbarBase::OnHotItemChange(const NMTBHOTITEM * hot, LRESULT * the
m_hotItem = hot->idNew;
m_menuBand->_OnHotItemChanged(this, m_hotItem);
m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING);
if (m_isTracking && !(m_toolbarFlags & SMINIT_VERTICAL))
{
KillTimer(m_hwndToolbar, TIMERID_HOTTRACK);
m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL, NULL, -1);
if (HasSubMenu(m_hotItem) == S_OK)
{
PopupItem(m_hotItem);
}
}
return S_OK;
}
return S_OK;
@ -491,7 +512,8 @@ HRESULT CMenuToolbarBase::OnPopupItemChanged(CMenuToolbarBase * toolbar, INT ite
{
if (toolbar == NULL && m_popupBar == this)
{
SendMessage(m_hwndToolbar, TB_CHECKBUTTON, item, FALSE);
SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_popupItem, FALSE);
m_isTracking = FALSE;
}
m_popupBar = toolbar;
m_popupItem = item;
@ -499,6 +521,32 @@ HRESULT CMenuToolbarBase::OnPopupItemChanged(CMenuToolbarBase * toolbar, INT ite
return S_OK;
}
HRESULT CMenuToolbarBase::IsTrackedItem(INT index)
{
TBBUTTON btn;
if (m_hotBar != this)
return S_FALSE;
SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn));
if (m_hotItem == btn.idCommand)
return S_OK;
return S_FALSE;
}
HRESULT CMenuToolbarBase::ChangeTrackedItem(INT index)
{
TBBUTTON btn;
SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn));
if (m_hotItem != btn.idCommand)
{
SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0);
}
return S_OK;
}
HRESULT CMenuToolbarBase::PopupSubMenu(UINT uItem, UINT index, IShellMenu* childShellMenu)
{
IBandSite* pBandSite;
@ -577,7 +625,8 @@ HRESULT CMenuToolbarBase::PopupSubMenu(UINT uItem, UINT index, IShellMenu* child
if (FAILED_UNEXPECTEDLY(hr))
return hr;
m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl, this, m_popupItem);
m_isTracking = TRUE;
m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl, this, uItem);
return S_OK;
}
@ -613,9 +662,11 @@ HRESULT CMenuToolbarBase::PopupSubMenu(UINT uItem, UINT index, HMENU menu)
HMENU popup = GetSubMenu(menu, index);
m_isTracking = TRUE;
m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, pt.x, pt.y, rcl);
SendMessage(m_hwndToolbar, TB_CHECKBUTTON, uItem, FALSE);
m_isTracking = FALSE;
return S_OK;
}
@ -841,6 +892,12 @@ HRESULT CMenuToolbarBase::PopupItem(INT uItem)
INT index;
DWORD_PTR dwData;
if (!(m_toolbarFlags & SMINIT_VERTICAL))
{
SendMessage(m_hwndToolbar, TB_SETHOTITEM, uItem, 0);
SendMessage(m_hwndToolbar, TB_CHECKBUTTON, uItem, TRUE);
}
GetDataFromId(uItem, &index, &dwData);
return InternalPopupItem(uItem, index, dwData);