diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2013-05-22 18:54:10 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-23 09:58:18 +0200 |
commit | 7a6c0f0673a239dd84614281f163dd7da1ad1f7a (patch) | |
tree | 5c7d57cca0c4a9820ea1330adc776d541490db6d | |
parent | 23fd348631cdec03736b5cd8bad2d877dddad38f (diff) |
QFusionStyle: fix highlight colors
Respect the current color group of the palette,
and fix the inactive highlight color.
Task-number: QTBUG-30034
Change-Id: Iddfc15a2dd98d4588c6c587b7aaf64d88538fa28
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r-- | src/gui/kernel/qpalette.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qfusionstyle_p_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 9684a00258..b266d31c5c 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -1127,7 +1127,7 @@ Q_GUI_EXPORT QPalette qt_fusionPalette() fusionPalette.setBrush(QPalette::Disabled, QPalette::Shadow, disabledShadow); fusionPalette.setBrush(QPalette::Active, QPalette::Highlight, QColor(48, 140, 198)); - fusionPalette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(145, 141, 126)); + fusionPalette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(48, 140, 198)); fusionPalette.setBrush(QPalette::Disabled, QPalette::Highlight, QColor(145, 141, 126)); return fusionPalette; } diff --git a/src/widgets/styles/qfusionstyle_p_p.h b/src/widgets/styles/qfusionstyle_p_p.h index 4af4f18798..a76ed24a4a 100644 --- a/src/widgets/styles/qfusionstyle_p_p.h +++ b/src/widgets/styles/qfusionstyle_p_p.h @@ -102,13 +102,13 @@ public: QColor highlight(const QPalette &pal) const { if (isMacSystemPalette(pal)) return QColor(60, 140, 230); - return pal.color(QPalette::Active, QPalette::Highlight); + return pal.color(QPalette::Highlight); } QColor highlightedText(const QPalette &pal) const { if (isMacSystemPalette(pal)) return Qt::white; - return pal.color(QPalette::Active, QPalette::HighlightedText); + return pal.color(QPalette::HighlightedText); } QColor outline(const QPalette &pal) const { |