diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2019-01-31 14:18:20 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-01-31 15:51:30 +0000 |
| commit | 90eb509a6655d25f52edf3ea0da27f83937e5727 (patch) | |
| tree | 689763cf38378d2c30edc61a2dbf04f2aa622278 /src/imports/controls/fusion | |
| parent | 0f5996a10a543bf43ee0fa60d0831b59a35df147 (diff) | |
Fusion: use white ButtonText when a dark system theme is in use
Button's text was previously black on a dark background with macOS'
dark mode. This patch makes it more readable.
Task-number: QTBUG-70819
Change-Id: Iaa9d31133434e67e04d5d831dcb8eeba191cbab4
Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/qquickfusiontheme.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/imports/controls/fusion/qquickfusiontheme.cpp b/src/imports/controls/fusion/qquickfusiontheme.cpp index ac88563a..107619bf 100644 --- a/src/imports/controls/fusion/qquickfusiontheme.cpp +++ b/src/imports/controls/fusion/qquickfusiontheme.cpp @@ -37,12 +37,16 @@ #include "qquickfusiontheme_p.h" #include <QtQuickTemplates2/private/qquicktheme_p.h> +#include <QtQuickControls2/private/qquickstyle_p.h> QT_BEGIN_NAMESPACE void QQuickFusionTheme::initialize(QQuickTheme *theme) { - Q_UNUSED(theme); + const bool isDarkSystemTheme = QQuickStylePrivate::isDarkSystemTheme(); + QPalette systemPalette; + systemPalette.setColor(QPalette::ButtonText, isDarkSystemTheme ? Qt::white : Qt::black); + theme->setPalette(QQuickTheme::System, systemPalette); } QT_END_NAMESPACE |