Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-10 19:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

- User32: menu, patch by Michael Kaufmann. Fix the keyboard navigation and some graphical glitches for multi-column menus.

Browse source 
svn path=/trunk/; revision=23579
This commit is contained in:
James Tabor 2006-08-14 14:44:40 +00:00
parent d634e929b4
commit 4fe1ff2259
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/dll/win32/user32/windows/menu.c
View file

@ -668,6 +668,7 @@ MenuDrawMenuItem(HWND Wnd, PROSMENUINFO MenuInfo, HWND WndOwner, HDC Dc,
{
HPEN oldPen;
RECT rc = Rect;
rc.left -= 3;
rc.top = 3;
rc.bottom = Height - 3;
if (flat_menu)
@ -1408,11 +1409,11 @@ MenuPopupMenuCalcSize(PROSMENUINFO MenuInfo, HWND WndOwner)
MenuSetRosMenuInfo(MenuInfo);
return;
}
if (0 != (ItemInfo.fType & MF_MENUBARBREAK))
{
OrgX++;
}
// Not sure here,, The patch from wine removes this.
// if (0 != (ItemInfo.fType & MF_MENUBARBREAK))
// {
// OrgX++;
// }
MaxX = max(MaxX, ItemInfo.Rect.right);
OrgY = ItemInfo.Rect.bottom;
if ((ItemInfo.Text) && 0 != ItemInfo.XTab)
@ -2664,7 +2665,7 @@ static UINT MenuGetStartOfNextColumn(PROSMENUINFO MenuInfo)
for (i++ ; i < MenuInfo->MenuItemCount; i++)
{
if (0 != (MenuItems[i].fType & MF_MENUBARBREAK))
if (0 != (MenuItems[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK)))
{
return i;
}
@ -2696,7 +2697,7 @@ MenuGetStartOfPrevColumn(PROSMENUINFO MenuInfo)
/* Find the start of the column */
for (i = MenuInfo->FocusedItem;
0 != i && 0 == (MenuItems[i].fType & MF_MENUBARBREAK);
0 != i && 0 == (MenuItems[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK));
--i)
{
; /* empty */
@ -2710,7 +2711,7 @@ MenuGetStartOfPrevColumn(PROSMENUINFO MenuInfo)
for (--i; 0 != i; --i)
{
if (MenuItems[i].fType & MF_MENUBARBREAK)
if (MenuItems[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK))
{
break;
}