diff options
| author | Philippe Lelong <maitai@virtual-winds.org> | 2014-07-08 10:47:06 +0200 |
|---|---|---|
| committer | Philippe Lelong <maitai@virtual-winds.org> | 2014-07-10 16:53:11 +0200 |
| commit | 4a1120a2f1959ca8bcb61062a2f7c33a46e57c59 (patch) | |
| tree | ddb63315b2368070159a8f3fef9ee954883ae5db /src/widgets/styles/qandroidstyle_p.h | |
| parent | 52eccc6cfa0f3b3649d60e3173382cdb68828f44 (diff) | |
Fix various issues with qandroidstyle
-Add style for checkable QGroupBox
-Add style for checkable QItemView
-Fix QSpinboxes contents size and position
-Fix QTreeView and QTableView headers size and position
-Fix Slider thumb position incorrect if minimum is not zero
Task-number: QTBUG-38717
Task-number: QTBUG-38325
Task-number: QTBUG-37965
Change-Id: I737f8d6f2d1c25d16aca0ce5de6b81884839409d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/widgets/styles/qandroidstyle_p.h')
| -rw-r--r-- | src/widgets/styles/qandroidstyle_p.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/widgets/styles/qandroidstyle_p.h b/src/widgets/styles/qandroidstyle_p.h index d64e37b9db..5334882908 100644 --- a/src/widgets/styles/qandroidstyle_p.h +++ b/src/widgets/styles/qandroidstyle_p.h @@ -132,6 +132,7 @@ public: static AndroidDrawable *fromMap(const QVariantMap &drawable, ItemType itemType); static QMargins extractMargins(const QVariantMap &value); virtual void setPaddingLeftToSizeWidth(); + QPixmap img() const; protected: ItemType m_itemType; QMargins m_padding; @@ -156,6 +157,7 @@ public: virtual void draw(QPainter *painter,const QStyleOption *opt) const; virtual QSize size() const; + QPixmap img() const; protected: QString m_filePath; mutable QString m_hashKey; @@ -228,7 +230,8 @@ public: inline const AndroidDrawable *bestAndroidStateMatch(const QStyleOption *opt) const; static int extractState(const QVariantMap &value); virtual void setPaddingLeftToSizeWidth(); - + QSize sizeImage(const QStyleOption *opt) const; + QPixmap img(const QStyleOption *opt) const; private: typedef QPair<int, const AndroidDrawable *> StateType; QList<StateType> m_states; @@ -281,7 +284,8 @@ public: AndroidCompoundButtonControl(const QVariantMap &control, ItemType itemType); virtual ~AndroidCompoundButtonControl(); virtual void drawControl(const QStyleOption *opt, QPainter *p, const QWidget *w); - + QSize sizeCheckBox(const QStyleOption *opt) const; + QPixmap imgCheckBox(const QStyleOption *opt) const; protected: virtual const AndroidDrawable * backgroundDrawable() const; const AndroidDrawable *m_button; @@ -387,6 +391,7 @@ private: typedef QHash<int, AndroidControl *> AndroidControlsHash; AndroidControlsHash m_androidControlsHash; QPalette m_standardPalette; + AndroidCompoundButtonControl *checkBoxControl; }; #endif // QT_NO_STYLE_ANDROID |