[zguo] 65047: [WIN32K] Cherrypick margin fix for menus. CORE-8667

Author: zguo
Date: Mon Oct 27 17:15:09 2014
New Revision: 65047

URL: http://svn.reactos.org/svn/reactos?rev=65047&view=rev
Log:
[WIN32K]
Cherrypick margin fix for menus.

CORE-8667

Modified:
    branches/0.3.17/reactos/   (props changed)
    branches/0.3.17/reactos/win32ss/user/ntuser/menu.c
    branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c

Propchange: branches/0.3.17/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Mon Oct 27 17:15:09 2014
@@ -18,4 +18,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909
+/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976

Modified: branches/0.3.17/reactos/win32ss/user/ntuser/menu.c
URL:
http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/ntu…
==============================================================================
--- branches/0.3.17/reactos/win32ss/user/ntuser/menu.c	[iso-8859-1] (original)
+++ branches/0.3.17/reactos/win32ss/user/ntuser/menu.c	[iso-8859-1] Mon Oct 27 17:15:09
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: branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/use…
==============================================================================
--- branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c	[iso-8859-1] (original)
+++ branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c	[iso-8859-1] Mon Oct 27
17:15:09 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 */