diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-10 16:32:42 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-10 14:53:37 +0000 |
| commit | 9947c815ea54c781bc1a9c95e26e2af1e6eebb87 (patch) | |
| tree | ed4f1878d2a7f3ac7d63cae3851dac082306039a /src/imports | |
| parent | 3b7e13510b355333c4215d04a731240201401a9d (diff) | |
SwipeDelegate: make icon color match text color
Task-number: QTBUG-60502
Change-Id: I5078eeebf90d92ddb7e0278eb8f81dcee2d360ca
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/SwipeDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/SwipeDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/SwipeDelegate.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml index acbabe2c..08320454 100644 --- a/src/imports/controls/SwipeDelegate.qml +++ b/src/imports/controls/SwipeDelegate.qml @@ -54,7 +54,7 @@ T.SwipeDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Default.textDisabledLightColor + icon.color: control.enabled ? Default.textDarkColor : Default.textDisabledColor swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index c84ee702..08f07e1f 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -58,7 +58,7 @@ T.SwipeDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Material.hintTextColor + icon.color: enabled ? Material.foreground : Material.hintTextColor swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index 23f327d1..246d4a15 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -58,7 +58,7 @@ T.SwipeDelegate { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } |