[WIN32K:NTUSER] Fix hardcoded color for MF_GRAYED menu items

CORE-14196 #resolve
This commit is contained in:
Stanislav Motylkov 2018-01-21 00:22:36 +03:00 committed by Giannis Adamopoulos
parent d849794a35
commit dade22f479

View file

@ -2511,11 +2511,11 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC
if (!(lpitem->fState & MF_HILITE) ) if (!(lpitem->fState & MF_HILITE) )
{ {
++rect.left; ++rect.top; ++rect.right; ++rect.bottom; ++rect.left; ++rect.top; ++rect.right; ++rect.bottom;
IntGdiSetTextColor(hdc, RGB(0xff, 0xff, 0xff)); IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_HIGHLIGHTTEXT));
DrawTextW( hdc, Text, i, &rect, uFormat ); DrawTextW( hdc, Text, i, &rect, uFormat );
--rect.left; --rect.top; --rect.right; --rect.bottom; --rect.left; --rect.top; --rect.right; --rect.bottom;
} }
IntGdiSetTextColor(hdc, RGB(0x80, 0x80, 0x80)); IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_GRAYTEXT));
} }
DrawTextW( hdc, Text, i, &rect, uFormat); DrawTextW( hdc, Text, i, &rect, uFormat);
@ -2538,11 +2538,11 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC
if (!(lpitem->fState & MF_HILITE) ) if (!(lpitem->fState & MF_HILITE) )
{ {
++rect.left; ++rect.top; ++rect.right; ++rect.bottom; ++rect.left; ++rect.top; ++rect.right; ++rect.bottom;
IntGdiSetTextColor(hdc, RGB(0xff, 0xff, 0xff)); IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_HIGHLIGHTTEXT));
DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat); DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat);
--rect.left; --rect.top; --rect.right; --rect.bottom; --rect.left; --rect.top; --rect.right; --rect.bottom;
} }
IntGdiSetTextColor(hdc, RGB(0x80, 0x80, 0x80)); IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_GRAYTEXT));
} }
DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat ); DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat );
} }