Visualize Material Button's highlighted state

Change-Id: I1c638c0b70a0ba8d0f5cfe1d7e41fd514c38c1c9
Task-number: QTBUG-49551
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 31 insertions, 3 deletions

diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index bae03cf1..05b63239 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -587,6 +587,11 @@ QColor QQuickMaterialStyle::primaryTextColor() const
     return d->theme == Light ? primaryTextColorLight : primaryTextColorDark;
 }
 
+QColor QQuickMaterialStyle::primaryHighlightedTextColor() const
+{
+    return primaryTextColorDark;
+}
+
 QColor QQuickMaterialStyle::secondaryTextColor() const
 {
     Q_D(const QQuickMaterialStyle);
@@ -620,20 +625,20 @@ QColor QQuickMaterialStyle::dividerColor() const
 QColor QQuickMaterialStyle::raisedButtonColor() const
 {
     Q_D(const QQuickMaterialStyle);
-    return d->theme == Light ? raisedButtonColorLight : accentColor();
+    return d->theme == Light ? raisedButtonColorLight : flatButtonFocusColorDark;
 }
 
 QColor QQuickMaterialStyle::raisedButtonHoverColor() const
 {
     Q_D(const QQuickMaterialStyle);
     // The specs don't specify different colors here for the light theme.
-    return d->theme == Light ? raisedButtonColorLight : color(d->accent, Shade600);
+    return d->theme == Light ? raisedButtonColorLight : flatButtonPressColorDark;
 }
 
 QColor QQuickMaterialStyle::raisedButtonPressColor() const
 {
     Q_D(const QQuickMaterialStyle);
-    return d->theme == Light ? raisedButtonPressColorLight : color(d->accent, Shade700);
+    return d->theme == Light ? raisedButtonPressColorLight : flatButtonPressColorDark;
 }
 
 QColor QQuickMaterialStyle::raisedButtonDisabledColor() const
@@ -642,6 +647,29 @@ QColor QQuickMaterialStyle::raisedButtonDisabledColor() const
     return d->theme == Light ? raisedButtonDisabledColorLight : raisedButtonDisabledColorDark;
 }
 
+QColor QQuickMaterialStyle::raisedHighlightedButtonColor() const
+{
+    return accentColor();
+}
+
+QColor QQuickMaterialStyle::raisedHighlightedButtonHoverColor() const
+{
+    Q_D(const QQuickMaterialStyle);
+    return color(d->accent, Shade600);
+}
+
+QColor QQuickMaterialStyle::raisedHighlightedButtonPressColor() const
+{
+    Q_D(const QQuickMaterialStyle);
+    return color(d->accent, Shade700);
+}
+
+QColor QQuickMaterialStyle::raisedHighlightedButtonDisabledColor() const
+{
+    Q_D(const QQuickMaterialStyle);
+    return d->theme == Light ? raisedButtonDisabledColorLight : raisedButtonDisabledColorDark;
+}
+
 QColor QQuickMaterialStyle::flatButtonPressColor() const
 {
     Q_D(const QQuickMaterialStyle);