diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:39:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:39:42 +0200 |
commit | 850f5868b7eef9746c49570ed4c8bfb2c5177ecc (patch) | |
tree | 91de4ddc14c65e946b2a87b33a5596a95d4c89ec /src/imports/controls/SwipeDelegate.qml | |
parent | eb1b76053f2c6f35f8a33bec71536ca24651a711 (diff) | |
parent | 0bd5c342013bfae63f1a7e13a0f531cb0a2c8581 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e
Diffstat (limited to 'src/imports/controls/SwipeDelegate.qml')
-rw-r--r-- | src/imports/controls/SwipeDelegate.qml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml index bed2ed03..4f2c9ee1 100644 --- a/src/imports/controls/SwipeDelegate.qml +++ b/src/imports/controls/SwipeDelegate.qml @@ -73,8 +73,7 @@ T.SwipeDelegate { background: Rectangle { implicitWidth: 100 implicitHeight: 40 - color: control.visualFocus - ? (control.down ? Default.focusPressedColor : Default.delegateFocusColor) - : (control.down ? Default.delegatePressedColor : Default.backgroundColor) + color: Color.blend(control.down ? control.palette.midlight : control.palette.light, + control.palette.highlight, control.visualFocus ? 0.15 : 0.0) } } |