From 2d3be6a9897ee271c083c7fe11cf723a7c8665b3 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 6 Oct 2016 09:55:27 +0200 Subject: winrt: prefer fusion over windows theme As on other mobile platforms, fusion should be preferred as the default theme instead of the desktop windows one. The styleHints from QPlatformIntegration are adapted on top of fusion then. Task-number: QTBUG-40667 Change-Id: I60836b4a199b29e63c400c2ed9bbbab7d3add902 Reviewed-by: Oliver Wolff --- src/plugins/platforms/winrt/qwinrttheme.cpp | 11 +++++++++++ src/plugins/platforms/winrt/qwinrttheme.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/winrt/qwinrttheme.cpp b/src/plugins/platforms/winrt/qwinrttheme.cpp index e9938894e6..f84688f045 100644 --- a/src/plugins/platforms/winrt/qwinrttheme.cpp +++ b/src/plugins/platforms/winrt/qwinrttheme.cpp @@ -369,6 +369,17 @@ QVariant QWinRTTheme::styleHint(QPlatformIntegration::StyleHint hint) return QVariant(); } +QVariant QWinRTTheme::themeHint(ThemeHint hint) const +{ + qCDebug(lcQpaTheme) << __FUNCTION__ << hint; + switch (hint) { + case StyleNames: + return QStringList() << QStringLiteral("fusion") << QStringLiteral("windows"); + default: + return QPlatformTheme::themeHint(hint); + } +} + const QPalette *QWinRTTheme::palette(Palette type) const { Q_D(const QWinRTTheme); diff --git a/src/plugins/platforms/winrt/qwinrttheme.h b/src/plugins/platforms/winrt/qwinrttheme.h index 2b8817d014..bd244f9fdb 100644 --- a/src/plugins/platforms/winrt/qwinrttheme.h +++ b/src/plugins/platforms/winrt/qwinrttheme.h @@ -60,7 +60,7 @@ public: const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; static QVariant styleHint(QPlatformIntegration::StyleHint hint); - + QVariant themeHint(ThemeHint hint) const override; private: QScopedPointer d_ptr; Q_DECLARE_PRIVATE(QWinRTTheme) -- cgit v1.2.3