AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows QPA: Fix disabled color of menu items in dark mode

Browse Source 
Replace green by the standard light color.

Fixes: QTBUG-82197
Change-Id: I12477a055788cc7b6c829e315d5ae9f1577770bf
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Friedemann Kleint 2020-02-17 12:40:30 +01:00
parent e2e596c0c5
commit c308a796d9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -248,8 +248,7 @@ enum DarkModeColors : QRgb {
darkModeBtnHighlightRgb = 0xc0c0c0, darkModeBtnHighlightRgb = 0xc0c0c0,
darkModeBtnShadowRgb = 0x808080, darkModeBtnShadowRgb = 0x808080,
darkModeHighlightRgb = 0x0055ff, // deviating from 0x800080 darkModeHighlightRgb = 0x0055ff, // deviating from 0x800080
darkModeMenuHighlightRgb = darkModeHighlightRgb, darkModeMenuHighlightRgb = darkModeHighlightRgb
darkModeGrayTextRgb = 0x00ff00
}; };
// from QStyle::standardPalette // from QStyle::standardPalette
@ -386,7 +385,7 @@ static inline QPalette menuPalette(const QPalette &systemPalette, bool light)
const QColor menuColor = light ? getSysColor(COLOR_MENU) : QColor(Qt::black); const QColor menuColor = light ? getSysColor(COLOR_MENU) : QColor(Qt::black);
const QColor menuTextColor = light ? getSysColor(COLOR_MENUTEXT) : QColor(Qt::white); const QColor menuTextColor = light ? getSysColor(COLOR_MENUTEXT) : QColor(Qt::white);
const QColor disabled = light const QColor disabled = light
? getSysColor(COLOR_GRAYTEXT) : QColor(darkModeGrayTextRgb); ? getSysColor(COLOR_GRAYTEXT) : QColor(darkModeBtnHighlightRgb);
// we might need a special color group for the result. // we might need a special color group for the result.
result.setColor(QPalette::Active, QPalette::Button, menuColor); result.setColor(QPalette::Active, QPalette::Button, menuColor);
result.setColor(QPalette::Active, QPalette::Text, menuTextColor); result.setColor(QPalette::Active, QPalette::Text, menuTextColor);