diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 10:11:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 12:37:29 +0000 |
| commit | 5dcd4daa0dbc9cd3618744193985f81e475d311a (patch) | |
| tree | eff09b0f38cad0ef0bb3319cf6b24e1b77f314b3 | |
| parent | 90e57fdd6ffb24af5951ff25909c97bd28fdc552 (diff) | |
Default: make delegates use palettes
Task-number: QTBUG-63369
Change-Id: Ie25329442763920b905c857c275472abaff9957c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/CheckDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/ItemDelegate.qml | 5 | ||||
| -rw-r--r-- | src/imports/controls/RadioDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/SwipeDelegate.qml | 5 | ||||
| -rw-r--r-- | src/imports/controls/SwitchDelegate.qml | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml index 1b03e1ff..55dd05eb 100644 --- a/src/imports/controls/CheckDelegate.qml +++ b/src/imports/controls/CheckDelegate.qml @@ -82,6 +82,6 @@ T.CheckDelegate { implicitWidth: 100 implicitHeight: 40 visible: control.down || control.highlighted - color: control.down ? Default.delegatePressedColor : Default.delegateColor + color: control.down ? control.palette.midlight : control.palette.light } } diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml index 8156bff1..1180a997 100644 --- a/src/imports/controls/ItemDelegate.qml +++ b/src/imports/controls/ItemDelegate.qml @@ -72,8 +72,7 @@ T.ItemDelegate { implicitWidth: 100 implicitHeight: 40 visible: control.down || control.highlighted || control.visualFocus - color: control.visualFocus - ? (control.pressed ? Default.focusPressedColor : Default.delegateFocusColor) - : (control.down ? Default.delegatePressedColor : Default.delegateColor) + color: Color.blend(control.down ? control.palette.midlight : control.palette.light, + control.palette.highlight, control.visualFocus ? 0.15 : 0.0) } } diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml index beb1aa9a..bf14dbc1 100644 --- a/src/imports/controls/RadioDelegate.qml +++ b/src/imports/controls/RadioDelegate.qml @@ -82,6 +82,6 @@ T.RadioDelegate { implicitWidth: 100 implicitHeight: 40 visible: control.down || control.highlighted - color: control.down ? Default.delegatePressedColor : Default.delegateColor + color: control.down ? control.palette.midlight : control.palette.light } } diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml index da3313a7..70c76f26 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) } } diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml index 0605a4cc..1c57c907 100644 --- a/src/imports/controls/SwitchDelegate.qml +++ b/src/imports/controls/SwitchDelegate.qml @@ -81,6 +81,6 @@ T.SwitchDelegate { implicitWidth: 100 implicitHeight: 40 visible: control.down || control.highlighted - color: control.down ? Default.delegatePressedColor : Default.delegateColor + color: control.down ? control.palette.midlight : control.palette.light } } |