diff options
| author | Nils Jeisecke <nils.jeisecke@saltation.com> | 2019-01-28 20:57:10 +0100 |
|---|---|---|
| committer | Nils Jeisecke <nils.jeisecke@saltation.com> | 2019-01-29 10:47:23 +0000 |
| commit | 0fac346a891225415833a411974085133ae5f076 (patch) | |
| tree | 4983ec1258bd62a1fe699b3e61e2925fae7ac694 /src/imports/controls/fusion | |
| parent | 28454b503c7e77a85855e1cc5911908d46d29366 (diff) | |
qquickfusionstyle: do not force a fixed white color for highlightedText
just like the previous fix for for the highlight color: use the system
palette.
Task-number: QTBUG-70652
Change-Id: I5c31927c53ba386f54de7c46ec9fe66c26e7a31b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/qquickfusionstyle.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp index cb3889c8..98c1894f 100644 --- a/src/imports/controls/fusion/qquickfusionstyle.cpp +++ b/src/imports/controls/fusion/qquickfusionstyle.cpp @@ -43,21 +43,6 @@ QT_BEGIN_NAMESPACE -// On mac we want a standard blue color used when the system palette is used -static bool isMacSystemPalette(const QPalette &palette) -{ - Q_UNUSED(palette); -#if defined(Q_OS_MACOS) - const QPalette *themePalette = QGuiApplicationPrivate::platformTheme()->palette(); - if (themePalette && themePalette->color(QPalette::Normal, QPalette::Highlight) == - palette.color(QPalette::Normal, QPalette::Highlight) && - themePalette->color(QPalette::Normal, QPalette::HighlightedText) == - palette.color(QPalette::Normal, QPalette::HighlightedText)) - return true; -#endif - return false; -} - QQuickFusionStyle::QQuickFusionStyle(QObject *parent) : QObject(parent) { @@ -90,8 +75,6 @@ QColor QQuickFusionStyle::highlight(const QPalette &palette) QColor QQuickFusionStyle::highlightedText(const QPalette &palette) { - if (isMacSystemPalette(palette)) - return Qt::white; return palette.color(QPalette::HighlightedText); } |