[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
This commit is contained in:
Joachim Henze 2020-10-24 17:21:18 +02:00
parent e580690b22
commit 9906c22843

View file

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