Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32SS][NTUSER] Make offset only for menu bars (#983)

Browse source 
CORE-15226
This commit is contained in:
Stanislav Motylkov 2018-10-27 12:45:21 +03:00 committed by Katayama Hirofumi MZ
parent 8e51bb6510
commit f819c9c460
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
win32ss/user/ntuser/menu.c
View file

@ -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);