Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS] Iteratively mutate menu flags until we find a 'best fit'

Browse source 
CORE-15863
This commit is contained in:
Mark Jansen 2019-08-04 23:47:02 +02:00
parent a59df3858c
commit 7c45a646e9
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 67 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
win32ss/user/ntuser/menu.c
View file

@ -2901,6 +2901,52 @@ static BOOL RECTL_Intersect(const RECT* pRect, INT x, INT y, UINT width, UINT he
return RECTL_bIntersectRect(&dum, pRect, &other); return RECTL_bIntersectRect(&dum, pRect, &other);
} }
static BOOL MENU_MoveRect(UINT flags, INT* x, INT* y, INT width, INT height, const RECT* pExclude, PMONITOR monitor)
{
/* Figure out if we should move vertical or horizontal */
if (flags & TPM_VERTICAL)
{
/* Move in the vertical direction: TPM_BOTTOMALIGN means drop it above, otherways drop it below */
if (flags & TPM_BOTTOMALIGN)
{
if (pExclude->top - height >= monitor->rcMonitor.top)
{
*y = pExclude->top - height;
return TRUE;
}
}
else
{
if (pExclude->bottom + height < monitor->rcMonitor.bottom)
{
*y = pExclude->bottom;
return TRUE;
}
}
}
else
{
/* Move in the horizontal direction: TPM_RIGHTALIGN means drop it to the left, otherways go right */
if (flags & TPM_RIGHTALIGN)
{
if (pExclude->left - width >= monitor->rcMonitor.left)
{
*x = pExclude->left - width;
return TRUE;
}
}
else
{
if (pExclude->right + width < monitor->rcMonitor.right)
{
*x = pExclude->right;
return TRUE;
}
}
}
return FALSE;
}
/*********************************************************************** /***********************************************************************
* MenuShowPopup * MenuShowPopup
* *
@ -2962,7 +3008,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl
/* We are off the right side of the screen */ /* We are off the right side of the screen */
if (x + width > monitor->rcMonitor.right) if (x + width > monitor->rcMonitor.right)
{ {
if ((x - width) < monitor->rcMonitor.left || x >= monitor->rcMonitor.right || bIsPopup) if ((x - width) < monitor->rcMonitor.left || x >= monitor->rcMonitor.right)
x = monitor->rcMonitor.right - width; x = monitor->rcMonitor.right - width;
else else
x -= width; x -= width;
@ -2996,39 +3042,35 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl
y -= height; y -= height;
} }
if (pExclude || bIsPopup) if (pExclude)
{ {
RECT PopupOrigin = {x-1, y-1, x+1, y+1};
RECT Cleaned; RECT Cleaned;
if (RECTL_bIntersectRect(&Cleaned, pExclude ? pExclude : &PopupOrigin, &monitor->rcMonitor) && if (RECTL_bIntersectRect(&Cleaned, pExclude, &monitor->rcMonitor) &&
RECTL_Intersect(&Cleaned, x, y, width, height)) RECTL_Intersect(&Cleaned, x, y, width, height))
{ {
/* Figure out if we should move vertical or horizontal */ UINT flag_mods[] = {
if (flags & TPM_VERTICAL) 0, /* First try the 'normal' way */
TPM_BOTTOMALIGN | TPM_RIGHTALIGN, /* Then try the opposite side */
TPM_VERTICAL, /* Then swap horizontal / vertical */
TPM_BOTTOMALIGN | TPM_RIGHTALIGN | TPM_VERTICAL, /* Then the other side again (still swapped hor/ver) */
};
UINT n;
for (n = 0; n < RTL_NUMBER_OF(flag_mods); ++n)
{ {
/* Move in the vertical direction: TPM_BOTTOMALIGN means drop it above, otherways drop it below */ INT tx = x;
if (flags & TPM_BOTTOMALIGN) INT ty = y;
/* Try to move a bit around */
if (MENU_MoveRect(flags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) &&
!RECTL_Intersect(&Cleaned, tx, ty, width, height))
{ {
y = Cleaned.top - height; x = tx;
} y = ty;
else break;
{
y = Cleaned.bottom;
}
}
else
{
/* Move in the horizontal direction: TPM_RIGHTALIGN means drop it to the left, otherways go right */
if (flags & TPM_RIGHTALIGN)
{
x = Cleaned.left - width;
}
else
{
x = Cleaned.right;
} }
} }
/* If none worked, we go with the original x/y */
} }
} }