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

[RSHELL]

Browse source 
* Give TrackPopupMenuEx the top-level window. Need to figure out how Windows does this, it probably does not simply use the top-level window that way.
* Give TrackPopupMenuEx better flags and a better exclude rect.
CORE-7586

svn path=/branches/shell-experiments/; revision=62469
This commit is contained in:
David Quintana 2014-03-10 12:01:37 +00:00
parent 2b06cdd40e
commit 6f06c27374
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -622,18 +622,22 @@ HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y, R
{
HWND sendTo = m_menuOwner;
// FIXME: use?
//TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude };
TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude };
UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN;
if (sendTo)
{
::TrackPopupMenuEx(popup, 0, x, y, sendTo, NULL); // &params);
::TrackPopupMenuEx(popup, flags, x, y, sendTo, &params);
}
else
{
// FIXME: Windows uses the top-level window when calling TrackPopupMenuEx,
// but this is probably not the means by which it obtains that HWND.
// Meanwhile, this works.
GetWindow(&sendTo);
::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, sendTo, NULL); // &params);
// TODO: use the result somehow
sendTo = GetAncestor(sendTo, GA_ROOT);
::TrackPopupMenuEx(popup, flags, x, y, sendTo, &params);
}
return S_OK;