summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2019-05-17 16:51:12 +0300
committerKonstantin Ritt <ritt.ks@gmail.com>2019-05-21 14:15:21 +0000
commite23d4b68f3f3b1467f032e4ce3501dab0feb5fee (patch)
treedb058babb615b9c72748df24a0a2f0b8abf2b175
parent4259e99c1990dc88632b85d945e9093cca47a831 (diff)
Material: account for accent color in flat highlighted button's ripple
According to https://material.io/design/components/buttons.html#text-button Change-Id: Ia36a676864a8f738d204cf8db9430b797f1f2f99 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/material/Button.qml3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 6f7d6c70..04c6664c 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -78,7 +78,6 @@ T.Button {
control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.foreground
}
- // TODO: Add a proper ripple/ink effect for mouse/touch input and focus state
background: Rectangle {
implicitWidth: 64
implicitHeight: control.Material.buttonHeight
@@ -113,7 +112,7 @@ T.Button {
pressed: control.pressed
anchor: control
active: control.down || control.visualFocus || control.hovered
- color: control.Material.rippleColor
+ color: control.flat && control.highlighted ? control.Material.highlightedRippleColor : control.Material.rippleColor
}
}
}