diff options
author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-10-07 10:29:48 +0200 |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-10-08 13:43:57 +0200 |
commit | 707eb8d28d6bc41a99676eeaec4716d4b2a15427 (patch) | |
tree | 709f63a0abe50519eb38080e50cb7be151e608af /src | |
parent | 183d04de908c4d759a823bb45dce142a6de15437 (diff) |
iOS: add system palette
Return a system palette that sets the correct
highligh (text selection) colors.
Change-Id: Ic0a18f931913f28bdc73d9ec4ae347fe38839f17
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/ios/qiostheme.h | 3 | ||||
-rw-r--r-- | src/plugins/platforms/ios/qiostheme.mm | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/plugins/platforms/ios/qiostheme.h b/src/plugins/platforms/ios/qiostheme.h index 16b330a030..4cedc7b879 100644 --- a/src/plugins/platforms/ios/qiostheme.h +++ b/src/plugins/platforms/ios/qiostheme.h @@ -35,6 +35,7 @@ #define QIOSTHEME_H #include <QtCore/QHash> +#include <QtGui/QPalette> #include <qpa/qplatformtheme.h> QT_BEGIN_NAMESPACE @@ -45,6 +46,7 @@ public: QIOSTheme(); ~QIOSTheme(); + const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; QVariant themeHint(ThemeHint hint) const; QPlatformMenuItem* createPlatformMenuItem() const Q_DECL_OVERRIDE; @@ -56,6 +58,7 @@ public: private: mutable QHash<QPlatformTheme::Font, QFont *> m_fonts; + QPalette m_systemPalette; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm index cbeb157cf2..c89dd7dc05 100644 --- a/src/plugins/platforms/ios/qiostheme.mm +++ b/src/plugins/platforms/ios/qiostheme.mm @@ -60,7 +60,10 @@ QT_BEGIN_NAMESPACE const char *QIOSTheme::name = "ios"; QIOSTheme::QIOSTheme() + : m_systemPalette(*QPlatformTheme::palette(QPlatformTheme::SystemPalette)) { + m_systemPalette.setBrush(QPalette::Highlight, QColor(204, 221, 237)); + m_systemPalette.setBrush(QPalette::HighlightedText, Qt::black); } QIOSTheme::~QIOSTheme() @@ -68,6 +71,13 @@ QIOSTheme::~QIOSTheme() qDeleteAll(m_fonts); } +const QPalette *QIOSTheme::palette(QPlatformTheme::Palette type) const +{ + if (type == QPlatformTheme::SystemPalette) + return &m_systemPalette; + return 0; +} + QPlatformMenuItem* QIOSTheme::createPlatformMenuItem() const { return new QIOSMenuItem(); |