diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-20 16:18:00 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-21 08:56:24 +0000 |
| commit | da9831af00d25545ff7fd080eabc13379d5d3dfe (patch) | |
| tree | 8433122f5e465f348a8d2f3a8f5f1acba708b7ce /src/imports/controls/material/qquickmaterialstyle_p.h | |
| parent | dadd3762547d3c311651a7ca8bbe995b743b2a90 (diff) | |
QQuickMaterialStyle: cleanup several unused colors
These are no longer used now that the hovered and focused states are
visualized by the ripple background, and the pressed state by the
ripple waves and the elevation shadow.
Change-Id: Ia2d315c2d8b31e4fcd77534f6128584b9daeb8d8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index eb85d3fa..301748bb 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -77,16 +77,8 @@ class QQuickMaterialStyle : public QQuickStyleAttached Q_PROPERTY(QColor dropShadowColor READ dropShadowColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor dividerColor READ dividerColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor buttonColor READ buttonColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor buttonHoverColor READ buttonHoverColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor buttonPressColor READ buttonPressColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor buttonDisabledColor READ buttonDisabledColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor highlightedButtonColor READ highlightedButtonColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor highlightedButtonHoverColor READ highlightedButtonHoverColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor highlightedButtonPressColor READ highlightedButtonPressColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor swipeDelegateColor READ swipeDelegateColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor swipeDelegateHoverColor READ swipeDelegateHoverColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor swipeDelegatePressColor READ swipeDelegatePressColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor swipeDelegateDisabledColor READ swipeDelegateDisabledColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor frameColor READ frameColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor checkBoxUncheckedRippleColor READ checkBoxUncheckedRippleColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor checkBoxCheckedRippleColor READ checkBoxCheckedRippleColor NOTIFY paletteChanged FINAL) @@ -206,17 +198,9 @@ public: QColor dropShadowColor() const; QColor dividerColor() const; QColor buttonColor() const; - QColor buttonHoverColor() const; - QColor buttonPressColor() const; QColor buttonDisabledColor() const; QColor highlightedButtonColor() const; - QColor highlightedButtonHoverColor() const; - QColor highlightedButtonPressColor() const; QColor highlightedButtonDisabledColor() const; - QColor swipeDelegateColor() const; - QColor swipeDelegateHoverColor() const; - QColor swipeDelegatePressColor() const; - QColor swipeDelegateDisabledColor() const; QColor frameColor() const; QColor checkBoxUncheckedRippleColor() const; QColor checkBoxCheckedRippleColor() const; @@ -259,7 +243,7 @@ private: QColor backgroundColor(Shade shade) const; QColor accentColor(Shade shade) const; - QColor buttonColor(bool highlighted, bool pressed, bool hover) const; + QColor buttonColor(bool highlighted) const; Shade themeShade() const; bool m_explicitTheme; |