diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-28 08:05:00 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-28 13:11:24 +0000 |
| commit | cf26976c32995ffc5988e770576d7b0c5b3d5ffc (patch) | |
| tree | 9c2492396092d2622b4c77552ee83f4d5441b4c2 | |
| parent | 382262da77637ea776b42c4e359671d7aa2ce8c4 (diff) | |
Default: make DelayButton use palettes
Task-number: QTBUG-63369
Change-Id: I1dfccfc2066c6346d7bd5e60105230446e047183
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/DelayButton.qml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml index bfbd2f08..461f4195 100644 --- a/src/imports/controls/DelayButton.qml +++ b/src/imports/controls/DelayButton.qml @@ -79,7 +79,7 @@ T.DelayButton { text: control.text font: control.font opacity: enabled ? 1 : 0.3 - color: control.visualFocus ? control.palette.highlight : control.palette.buttonText + color: control.palette.buttonText horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -113,14 +113,15 @@ T.DelayButton { background: Rectangle { implicitWidth: 100 implicitHeight: 40 - color: control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor) + color: Color.blend(control.palette.button, control.palette.mid, control.down ? 0.5 : 0.0) border.color: control.palette.highlight border.width: control.visualFocus ? 2 : 0 - Rectangle { + PaddedRectangle { + padding: control.visualFocus ? 2 : 0 width: control.progress * parent.width height: parent.height - color: control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : control.palette.highlight) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor) + color: Color.blend(control.palette.dark, control.palette.mid, control.down ? 0.5 : 0.0) } } } |