diff options
author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-10-06 09:55:27 +0200 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-10-06 10:33:48 +0000 |
commit | 2d3be6a9897ee271c083c7fe11cf723a7c8665b3 (patch) | |
tree | 22e1260fa9dac92984a39385403704ec28d2db2d | |
parent | 7a7b745917d538e61cb5c9d4da1a53804c4ceade (diff) |
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 <oliver.wolff@qt.io>
-rw-r--r-- | src/plugins/platforms/winrt/qwinrttheme.cpp | 11 | ||||
-rw-r--r-- | src/plugins/platforms/winrt/qwinrttheme.h | 2 |
2 files changed, 12 insertions, 1 deletions
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<QWinRTThemePrivate> d_ptr; Q_DECLARE_PRIVATE(QWinRTTheme) |