Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k]

Browse source 
- Fix a copy paste error, see CORE-8667.
- Set top margin to 2.

svn path=/trunk/; revision=64976
This commit is contained in:
James Tabor 2014-10-25 11:45:47 +00:00
parent 36c59fdf14
commit e4cff1c66a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/win32ss/user/ntuser/menu.c
View file

@ -649,7 +649,7 @@ IntGetMenuInfo(PMENU Menu, PROSMENUINFO lpmi)
lpmi->cyMenu = Menu->cyMenu; lpmi->cyMenu = Menu->cyMenu;
lpmi->spwndNotify = Menu->spwndNotify; lpmi->spwndNotify = Menu->spwndNotify;
lpmi->cxTextAlign = Menu->cxTextAlign; lpmi->cxTextAlign = Menu->cxTextAlign;
lpmi->iTop = Menu->iMaxTop; lpmi->iTop = Menu->iTop;
lpmi->iMaxTop = Menu->iMaxTop; lpmi->iMaxTop = Menu->iMaxTop;
lpmi->dwArrowsOn = Menu->dwArrowsOn; lpmi->dwArrowsOn = Menu->dwArrowsOn;

6
reactos/win32ss/user/user32/windows/menu.c
View file

@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(menu);
#define MENU_COL_SPACE 4 #define MENU_COL_SPACE 4
/* top and bottom margins for popup menus */ /* top and bottom margins for popup menus */
#define MENU_TOP_MARGIN 3 #define MENU_TOP_MARGIN 2 //3
#define MENU_BOTTOM_MARGIN 2 #define MENU_BOTTOM_MARGIN 2
#define MENU_TYPE_MASK (MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR) #define MENU_TYPE_MASK (MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR)
@ -395,7 +395,7 @@ MenuGetRosMenuInfo(PROSMENUINFO MenuInfo, HMENU Menu)
MenuInfo->cyMenu = pMenu->cyMenu; MenuInfo->cyMenu = pMenu->cyMenu;
MenuInfo->spwndNotify = pMenu->spwndNotify; MenuInfo->spwndNotify = pMenu->spwndNotify;
MenuInfo->cxTextAlign = pMenu->cxTextAlign; MenuInfo->cxTextAlign = pMenu->cxTextAlign;
MenuInfo->iTop = pMenu->iMaxTop; MenuInfo->iTop = pMenu->iTop;
MenuInfo->iMaxTop = pMenu->iMaxTop; MenuInfo->iMaxTop = pMenu->iMaxTop;
MenuInfo->dwArrowsOn = pMenu->dwArrowsOn; MenuInfo->dwArrowsOn = pMenu->dwArrowsOn;
@ -1301,7 +1301,7 @@ static void FASTCALL MenuPopupMenuCalcSize(PROSMENUINFO MenuInfo, HWND WndOwner)
orgX = maxX; orgX = maxX;
//if( lpitem.fType & (MF_MENUBREAK | MF_MENUBARBREAK)) //if( lpitem.fType & (MF_MENUBREAK | MF_MENUBARBREAK))
// orgX += MENU_COL_SPACE; // orgX += MENU_COL_SPACE;
orgY = 2;//MENU_TOP_MARGIN; orgY = MENU_TOP_MARGIN;
maxTab = maxTabWidth = 0; maxTab = maxTabWidth = 0;
/* Parse items until column break or end of menu */ /* Parse items until column break or end of menu */