aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2017-02-14 09:42:37 +0100
committerMitch Curtis <mitch.curtis@qt.io>2017-02-24 12:15:38 +0000
commitc7994835630cf5a34fda22829d6462b8a0d34ae9 (patch)
tree3b6582f6c2d9985ff21b8306ff6d4c58bbc768c3 /src
parent398691d74e9a2bc944a4816ebc78d0beef780fec (diff)
Material: remove color animation on various controls' background
This resulted in the background becoming very dark when toggling between enabled/disabled or editable/read-only states. Task-number: QTBUG-58828 Change-Id: I710fa97aefd26e490a219ba99833d5bfe47f2133 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/controls/material/Button.qml6
-rw-r--r--src/imports/controls/material/ComboBox.qml7
-rw-r--r--src/imports/controls/material/DelayButton.qml6
-rw-r--r--src/imports/controls/material/RoundButton.qml6
4 files changed, 0 insertions, 25 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 471ca8f2..e5821375 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -92,12 +92,6 @@ T.Button {
color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor
}
- Behavior on color {
- ColorAnimation {
- duration: 400
- }
- }
-
// The layer is disabled when the button color is transparent so you can do
// Material.background: "transparent" and get a proper flat button without needing
// to set Material.elevation as well
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 0721e8f3..c76834bf 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -108,13 +108,6 @@ T.ComboBox {
radius: control.flat ? 0 : 2
color: !control.editable ? control.Material.dialogColor : "transparent"
- Behavior on color {
- enabled: !control.editable
- ColorAnimation {
- duration: 400
- }
- }
-
layer.enabled: control.enabled && !control.editable && control.Material.background.a > 0
layer.effect: ElevationEffect {
elevation: control.Material.elevation
diff --git a/src/imports/controls/material/DelayButton.qml b/src/imports/controls/material/DelayButton.qml
index 8bc48784..16f240a2 100644
--- a/src/imports/controls/material/DelayButton.qml
+++ b/src/imports/controls/material/DelayButton.qml
@@ -102,12 +102,6 @@ T.DelayButton {
}
}
- Behavior on color {
- ColorAnimation {
- duration: 400
- }
- }
-
layer.enabled: control.enabled && control.Material.buttonColor.a > 0
layer.effect: ElevationEffect {
elevation: control.Material.elevation
diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml
index 3ce3b39b..249acb20 100644
--- a/src/imports/controls/material/RoundButton.qml
+++ b/src/imports/controls/material/RoundButton.qml
@@ -96,12 +96,6 @@ T.RoundButton {
color: control.Material.rippleColor
}
- Behavior on color {
- ColorAnimation {
- duration: 400
- }
- }
-
// The layer is disabled when the button color is transparent so that you can do
// Material.background: "transparent" and get a proper flat button without needing
// to set Material.elevation as well