From 90eb509a6655d25f52edf3ea0da27f83937e5727 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Thu, 31 Jan 2019 14:18:20 +0100
Subject: 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>
---
 src/imports/controls/fusion/qquickfusiontheme.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/imports')

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
-- 
cgit v1.2.3