diff options
| author | Nikita Krupenko <krnekit@gmail.com> | 2016-04-20 21:24:40 +0300 |
|---|---|---|
| committer | Nikita Krupenko <krnekit@gmail.com> | 2016-04-20 18:39:58 +0000 |
| commit | 3090b31c4a99bf725baa0996b49ae9d31124bf76 (patch) | |
| tree | 5408fd18dcd6dc5b2062650799a9c78855aea89e | |
| parent | b12641c50c9cd82e65e14df70cd1dbb388acc006 (diff) | |
Material: rename internal constants for divider color
Change-Id: If34a0f6db74a8cd3e75fd0fa2217bbb4920d71d2
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 3213da12..9d38b079 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -389,13 +389,13 @@ static const QRgb secondaryTextColorLight = 0x89000000; static const QRgb secondaryTextColorDark = 0xB2FFFFFF; static const QRgb hintTextColorLight = 0x60000000; static const QRgb hintTextColorDark = 0x4CFFFFFF; -static const QRgb dividerTextColorLight = 0x1E000000; -static const QRgb dividerTextColorDark = 0x1EFFFFFF; +static const QRgb dividerColorLight = 0x1E000000; +static const QRgb dividerColorDark = 0x1EFFFFFF; static const QRgb raisedButtonColorLight = 0xFFD6D7D7; // TODO: find out actual value static const QRgb raisedButtonPressColorLight = 0xFFCCCDCD; -static const QRgb raisedButtonDisabledColorLight = dividerTextColorLight; -static const QRgb raisedButtonDisabledColorDark = dividerTextColorDark; +static const QRgb raisedButtonDisabledColorLight = dividerColorLight; +static const QRgb raisedButtonDisabledColorDark = dividerColorDark; static const QRgb flatButtonPressColorLight = 0x66999999; static const QRgb flatButtonPressColorDark = 0x3FCCCCCC; static const QRgb flatButtonFocusColorLight = 0x33CCCCCC; @@ -805,7 +805,7 @@ QColor QQuickMaterialStyle::dropShadowColor() const QColor QQuickMaterialStyle::dividerColor() const { - return QColor::fromRgba(m_theme == Light ? dividerTextColorLight : dividerTextColorDark); + return QColor::fromRgba(m_theme == Light ? dividerColorLight : dividerColorDark); } QColor QQuickMaterialStyle::raisedButtonColor() const @@ -943,7 +943,7 @@ QColor QQuickMaterialStyle::scrollBarPressedColor() const QColor QQuickMaterialStyle::drawerBackgroundColor() const { - return QColor::fromRgba(dividerTextColorLight); + return QColor::fromRgba(dividerColorLight); } QColor QQuickMaterialStyle::dialogColor() const |