1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows11Style: don't modify palette for buttons in polish()

Browse Source 
There is no need to screw up the palette of buttons in polish() - the
colors are not honored at all.

Pick-to: 6.9 6.8
Task-number: QTBUG-132433
Change-Id: I4df1f046690d1aa9b07fc538441d6ea50d0216ce
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
This commit is contained in:
Christian Ehrlicher 2025-01-25 17:08:01 +01:00
parent 21ef8bed6d
commit 6a46395614
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/styles/modernwindows/qwindows11style.cpp
View File

@ -2203,23 +2203,6 @@ void QWindows11Style::polish(QWidget* widget)
pal.setColor(QPalette::ButtonText, pal.text().color()); pal.setColor(QPalette::ButtonText, pal.text().color());
pal.setColor(QPalette::BrightText, pal.text().color()); pal.setColor(QPalette::BrightText, pal.text().color());
widget->setPalette(pal); widget->setPalette(pal);
} else if (widget->inherits("QAbstractButton") || widget->inherits("QToolButton")) {
widget->setAutoFillBackground(false);
auto pal = widget->palette();
if (QPushButton *btn = qobject_cast<QPushButton*>(widget)) {
if (btn->isFlat() && !pal.isBrushSet(QPalette::Active, QPalette::Button))
pal.setColor(QPalette::Active, QPalette::Button, pal.window().color());
}
if (colorSchemeIndex == 0) {
pal.setColor(QPalette::Disabled, QPalette::ButtonText, QColor(0x00,0x00,0x00,0x5C));
pal.setColor(QPalette::Disabled, QPalette::Button, QColor(0xF9,0xF9,0xF9,0x4D));
}
else {
pal.setColor(QPalette::Disabled, QPalette::ButtonText, QColor(0xFF,0xFF,0xFF,0x87));
pal.setColor(QPalette::Disabled, QPalette::Button, QColor(0xFF,0xFF,0xFF,0x6B));
}
widget->setPalette(pal);
} else if (qobject_cast<QGraphicsView *>(widget) && !qobject_cast<QTextEdit *>(widget)) { } else if (qobject_cast<QGraphicsView *>(widget) && !qobject_cast<QTextEdit *>(widget)) {
QPalette pal = widget->palette(); QPalette pal = widget->palette();
pal.setColor(QPalette::Base, pal.window().color()); pal.setColor(QPalette::Base, pal.window().color());