From c22c6e3ba349c4db4b5d7dda2dbe28636da0dabb Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Mon, 22 Jan 2018 00:09:16 +0300 Subject: [PATCH] [WIN32K:NTUSER] Fix color indices for themes CORE-14231 #resolve --- win32ss/user/ntuser/menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 1407ef1d0a7..4de96e892ac 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2511,11 +2511,11 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC if (!(lpitem->fState & MF_HILITE) ) { ++rect.left; ++rect.top; ++rect.right; ++rect.bottom; - IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_HIGHLIGHTTEXT)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); DrawTextW( hdc, Text, i, &rect, uFormat ); --rect.left; --rect.top; --rect.right; --rect.bottom; } - IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_GRAYTEXT)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNSHADOW)); } 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) ) { ++rect.left; ++rect.top; ++rect.right; ++rect.bottom; - IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_HIGHLIGHTTEXT)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat); --rect.left; --rect.top; --rect.right; --rect.bottom; } - IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_GRAYTEXT)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNSHADOW)); } DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat ); }