Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] CDefView: Find a reasonable place to show a context menu

Browse source 
Previously, we would treat the input as unsigned coordinates, this is wrong!
If the coordinates are invalid, we try to find a focused or selected item.
The center of this item is where we'll show the menu.
When there is no item, we default to 0,0
This commit is contained in:
Mark Jansen 2019-01-14 21:49:59 +01:00 committed by Giannis Adamopoulos
parent f9e50f5471
commit 9ae373a023
1 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dll/win32/shell32/CDefView.cpp
View file

@ -1324,14 +1324,11 @@ cleanup:
*/ */
LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{ {
WORD x, y; int x, y;
UINT uCommand; UINT uCommand;
HRESULT hResult; HRESULT hResult;
x = LOWORD(lParam); TRACE("(%p)->()\n", this);
y = HIWORD(lParam);
TRACE("(%p)->(0x%08x 0x%08x) stub\n", this, x, y);
m_hContextMenu = CreatePopupMenu(); m_hContextMenu = CreatePopupMenu();
if (!m_hContextMenu) if (!m_hContextMenu)
@ -1348,6 +1345,43 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b
if (FAILED_UNEXPECTEDLY(hResult)) if (FAILED_UNEXPECTEDLY(hResult))
goto cleanup; goto cleanup;
/* There is no position requested, so try to find one */
if (lParam == ~0)
{
int lvIndex;
POINT pt;
/* Do we have a focused item, */
if ((lvIndex = m_ListView.GetNextItem(-1, LVIS_FOCUSED)) < 0)
{
/* or a selected item? */
lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED);
}
/* We got something */
if (lvIndex > -1)
{
/* Let's find the center of the icon */
RECT rc = { LVIR_ICON };
m_ListView.SendMessage(LVM_GETITEMRECT, lvIndex, (LPARAM)&rc);
pt.x = (rc.right + rc.left) / 2;
pt.y = (rc.bottom + rc.top) / 2;
}
else
{
/* We have to drop it somewhere.. */
pt.x = pt.y = 0;
}
m_ListView.ClientToScreen(&pt);
x = pt.x;
y = pt.y;
}
else
{
x = GET_X_LPARAM(lParam);
y = GET_Y_LPARAM(lParam);
}
uCommand = TrackPopupMenu(m_hContextMenu, uCommand = TrackPopupMenu(m_hContextMenu,
TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON,
x, y, 0, m_hWnd, NULL); x, y, 0, m_hWnd, NULL);