Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-20 07:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI]

Browse source 
* Load and use rshell for the menubar.
* Properly forward WM_NOTIFY and WM_COMMAND messages to the toolbars.

[RSHELL]
* Improve behaviour of horizontal menubands.
* Clicking on submenu items does not work yet.

CORE-7586

svn path=/branches/shell-experiments/; revision=62448
This commit is contained in:
David Quintana 2014-03-07 22:28:55 +00:00
parent a8919a7a3b
commit 2ca6b95aeb
11 changed files with 288 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,10 @@ CMenuBand::CMenuBand() :
m_site(NULL),
m_psmc(NULL),
m_subMenuChild(NULL),
m_hmenu(NULL),
m_menuOwner(NULL),
m_useBigIcons(FALSE),
m_topLevelWindow(NULL),
m_hotBar(NULL),
m_hotItem(-1)
{
@ -123,7 +126,7 @@ HRESULT STDMETHODCALLTYPE CMenuBand::SetMenu(
m_staticToolbar = new CMenuStaticToolbar(this);
}
m_hmenu = hmenu;
m_menuOwner;
m_menuOwner = hwnd;
HRESULT hr = m_staticToolbar->SetMenu(hmenu, hwnd, dwFlags);
if (FAILED_UNEXPECTEDLY(hr))
@ -203,7 +206,7 @@ HRESULT STDMETHODCALLTYPE CMenuBand::SetSite(IUnknown *pUnkSite)
}
hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_subMenuParent));
if (FAILED_UNEXPECTEDLY(hr))
if (FAILED(hr) && hr != E_NOINTERFACE)
return hr;
CComPtr<IOleWindow> pTopLevelWindow;
@ -326,10 +329,13 @@ HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow)
return hr;
}
if (fShow)
hr = m_focusManager->PushMenu(this);
else
hr = m_focusManager->PopMenu(this);
if (m_dwFlags & SMINIT_VERTICAL)
{
if (fShow)
hr = m_focusManager->PushMenu(this);
else
hr = m_focusManager->PopMenu(this);
}
return S_OK;
}
@ -401,6 +407,8 @@ HRESULT STDMETHODCALLTYPE CMenuBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdI
{
return S_FALSE;
}
return S_FALSE;
}
UNIMPLEMENTED;
@ -610,9 +618,24 @@ HRESULT CMenuBand::_CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id, LPI
return hr;
}
HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y)
HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y, RECT& rcExclude)
{
::TrackPopupMenu(popup, 0, x, y, 0, m_menuOwner, NULL);
HWND sendTo = m_menuOwner;
// FIXME: use?
//TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude };
if (sendTo)
{
::TrackPopupMenuEx(popup, 0, x, y, sendTo, NULL); // &params);
}
else
{
GetWindow(&sendTo);
::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, sendTo, NULL); // &params);
// TODO: use the result somehow
}
return S_OK;
}