diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-28 16:30:55 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-29 15:27:05 +0000 |
commit | 0e5f2190b242dc1fc0d36d96780a01c0fa3dc6d0 (patch) | |
tree | 63e6551dbafdbc37a8d6980f152ece026d2f19ca /src/imports/controls | |
parent | 14523f0d26417562ad160833dfd6023f84d2cabe (diff) |
Default: make SpinBox use palettes
Task-number: QTBUG-63369
Change-Id: I2b31b35d61c61b37234c7da4ace75c4645bc076a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls')
-rw-r--r-- | src/imports/controls/SpinBox.qml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index 56cee139..067507d8 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -94,21 +94,21 @@ T.SpinBox { height: parent.height implicitWidth: 40 implicitHeight: 40 - color: up.pressed ? Default.buttonPressedColor : Default.buttonColor + color: up.pressed ? control.palette.mid : control.palette.button Rectangle { x: (parent.width - width) / 2 y: (parent.height - height) / 2 width: parent.width / 3 height: 2 - color: enabled ? Default.textColor : Default.textDisabledColor + color: enabled ? control.palette.buttonText : control.palette.mid } Rectangle { x: (parent.width - width) / 2 y: (parent.height - height) / 2 width: 2 height: parent.width / 3 - color: enabled ? Default.textColor : Default.textDisabledColor + color: enabled ? control.palette.buttonText : control.palette.mid } } @@ -117,19 +117,20 @@ T.SpinBox { height: parent.height implicitWidth: 40 implicitHeight: 40 - color: down.pressed ? Default.buttonPressedColor : Default.buttonColor + color: down.pressed ? control.palette.mid : control.palette.button Rectangle { x: (parent.width - width) / 2 y: (parent.height - height) / 2 width: parent.width / 3 height: 2 - color: enabled ? Default.textColor : Default.textDisabledColor + color: enabled ? control.palette.buttonText : control.palette.mid } } background: Rectangle { implicitWidth: 140 - border.color: Default.buttonColor + color: enabled ? control.palette.base : control.palette.button + border.color: control.palette.button } } |