[ros-diffs] 01/01: [WIN32SS][NTUSER] Make offset only for menu bars (#983)

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f819c9c460c0655cb3e49…

commit f819c9c460c0655cb3e498db37a1bd971794ff8b
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Sat Oct 27 12:45:21 2018 +0300
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Sat Oct 27 18:45:21 2018 +0900

    [WIN32SS][NTUSER] Make offset only for menu bars (#983)
    
    CORE-15226
---
 win32ss/user/ntuser/menu.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c
index dfab116bbc..a708729914 100644
--- a/win32ss/user/ntuser/menu.c
+++ b/win32ss/user/ntuser/menu.c
@@ -1781,7 +1781,8 @@ static void FASTCALL MENU_DrawBitmapItem(HDC hdc, PITEM lpitem,
const RECT *rect
     rop=((lpitem->fState & MF_HILITE) && !IS_MAGIC_BITMAP(hbmToDraw)) ?
NOTSRCCOPY : SRCCOPY;
     if ((lpitem->fState & MF_HILITE) && lpitem->hbmp)
         IntGdiSetBkColor(hdc, IntGetSysColor(COLOR_HIGHLIGHT));
-    if (!flat_menu &&
+    if (MenuBar &&
+        !flat_menu &&
         (lpitem->fState & (MF_HILITE | MF_GRAYED)) == MF_HILITE)
     {
         ++left;
@@ -2531,7 +2532,8 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND
WndOwner, HDC
                     break;
         }
 
-        if (!flat_menu &&
+        if (menuBar &&
+            !flat_menu &&
             (lpitem->fState & (MF_HILITE | MF_GRAYED)) == MF_HILITE)
         {
             RECTL_vOffsetRect(&rect, +1, +1);
@@ -2578,7 +2580,8 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND
WndOwner, HDC
             DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat );
         }
 
-        if (!flat_menu &&
+        if (menuBar &&
+            !flat_menu &&
             (lpitem->fState & (MF_HILITE | MF_GRAYED)) == MF_HILITE)
         {
             RECTL_vOffsetRect(&rect, -1, -1);