[ros-diffs] [jimtabor] 64976: [Win32k] - Fix a copy paste error, see CORE-8667. - Set top margin to 2.

[jimtabor]

Author: jimtabor
Date: Sat Oct 25 11:45:47 2014
New Revision: 64976

URL: http://svn.reactos.org/svn/reactos?rev=64976&view=rev
Log:
[Win32k]
- Fix a copy paste error, see CORE-8667.
- Set top margin to 2.

Modified:
    trunk/reactos/win32ss/user/ntuser/menu.c
    trunk/reactos/win32ss/user/user32/windows/menu.c

Modified: trunk/reactos/win32ss/user/ntuser/menu.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c?rev=64976&r1=64975&r2=64976&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/menu.c    [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/menu.c    [iso-8859-1] Sat Oct 25 
11:45:47 2014
@@ -649,7 +649,7 @@
      lpmi->cyMenu = Menu->cyMenu;
      lpmi->spwndNotify = Menu->spwndNotify;
      lpmi->cxTextAlign = Menu->cxTextAlign;
-     lpmi->iTop = Menu->iMaxTop;
+     lpmi->iTop = Menu->iTop;
      lpmi->iMaxTop = Menu->iMaxTop;
      lpmi->dwArrowsOn = Menu->dwArrowsOn;
 

Modified: trunk/reactos/win32ss/user/user32/windows/menu.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/windows/menu.c?rev=64976&r1=64975&r2=64976&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/menu.c    [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/menu.c    [iso-8859-1] Sat Oct 25 
11:45:47 2014
@@ -43,7 +43,7 @@
 #define MENU_COL_SPACE 4
 
 /*  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_TYPE_MASK (MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR)
@@ -395,7 +395,7 @@
   MenuInfo->cyMenu = pMenu->cyMenu;
   MenuInfo->spwndNotify = pMenu->spwndNotify;
   MenuInfo->cxTextAlign = pMenu->cxTextAlign;
-  MenuInfo->iTop = pMenu->iMaxTop;
+  MenuInfo->iTop = pMenu->iTop;
   MenuInfo->iMaxTop = pMenu->iMaxTop;
   MenuInfo->dwArrowsOn = pMenu->dwArrowsOn;
 
@@ -1301,7 +1301,7 @@
       orgX = maxX;
       //if( lpitem.fType & (MF_MENUBREAK | MF_MENUBARBREAK))
       //    orgX += MENU_COL_SPACE;
-      orgY = 2;//MENU_TOP_MARGIN;
+      orgY = MENU_TOP_MARGIN;
 
       maxTab = maxTabWidth = 0;
       /* Parse items until column break or end of menu */