Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-08 01:47:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.13][WIN32SS] Fix regression CORE-16306 PR-1943

Browse source 
Symptom:
The menu popup position for language selection in UltraIso regressed

It regressed by 0.4.13-dev-791-g
a59df3858c

Many thanks to the author Mark Jansen.

The fix has not been committed to master yet, but I hope
the PR will be merged during the next days as well.
This commit is contained in:
Joachim Henze 2019-10-12 03:35:47 +02:00
parent 0a03b36aee
commit 609f2aeeb7
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1480,7 +1480,8 @@ MENU_AdjustMenuItemRect(PMENU menu, PRECTL rect)
static ITEM *MENU_FindItemByCoords( MENU *menu, POINT pt, UINT *pos ) static ITEM *MENU_FindItemByCoords( MENU *menu, POINT pt, UINT *pos )
{ {
ITEM *item; ITEM *item;
UINT i, cx, cy; UINT i;
INT cx, cy;
RECT rect; RECT rect;
PWND pWnd = ValidateHwndNoErr(menu->hWnd); PWND pWnd = ValidateHwndNoErr(menu->hWnd);
@ -2938,7 +2939,7 @@ static BOOL MENU_MoveRect(UINT flags, INT* x, INT* y, INT width, INT height, con
static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT flags, static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT flags,
INT x, INT y, const RECT* pExclude) INT x, INT y, const RECT* pExclude)
{ {
UINT width, height; INT width, height;
POINT ptx; POINT ptx;
PMONITOR monitor; PMONITOR monitor;
PWND pWnd; PWND pWnd;
@ -3410,7 +3411,7 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi
RECT rc; RECT rc;
rc.left = Item->xItem; rc.left = Item->xItem;
rc.top = Item->yItem; rc.top = Item->yItem;
rc.right = Item->cxItem; // Do this for now...... rc.right = Item->cxItem;
rc.bottom = Item->cyItem; rc.bottom = Item->cyItem;
MENU_AdjustMenuItemRect(Menu, &rc); MENU_AdjustMenuItemRect(Menu, &rc);