From 9906c228436c793e4960aaf40421b9e262a0941a Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Sat, 24 Oct 2020 17:21:18 +0200 Subject: [PATCH] [0.4.7][WIN32K:NTUSER] Backport CORE-14196 & CORE-14231 2 nice theme patches of Stanislav Motylkov Fix hardcoded color for MF_GRAYED menu items CORE-14196 Picked from 0.4.8-dev-792-gdade22f Fix color indices for themes CORE-14231 Picked from 0.4.8-dev-846-gc22c6e3 --- 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 4b4676bdad0..b6dfd8260ab 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, RGB(0xff, 0xff, 0xff)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); DrawTextW( hdc, Text, i, &rect, uFormat ); --rect.left; --rect.top; --rect.right; --rect.bottom; } - IntGdiSetTextColor(hdc, RGB(0x80, 0x80, 0x80)); + 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, RGB(0xff, 0xff, 0xff)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat); --rect.left; --rect.top; --rect.right; --rect.bottom; } - IntGdiSetTextColor(hdc, RGB(0x80, 0x80, 0x80)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNSHADOW)); } DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat ); }