diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-28 16:23:49 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-29 15:27:02 +0000 |
| commit | 14523f0d26417562ad160833dfd6023f84d2cabe (patch) | |
| tree | 93c115a7eb5d39a2ced3280e16e3075dcff7cbd5 | |
| parent | d5f301f2bd239bf49b4b579ae01f40a34f90d026 (diff) | |
Default: make ComboBox use palettes
Task-number: QTBUG-63369
Change-Id: I68270893bd7b56585095661b1cda21a28893c631
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 289c321f..7e12f4e3 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -64,7 +64,8 @@ T.ComboBox { indicator: ColorImage { x: control.mirrored ? control.padding : control.width - width - control.padding y: control.topPadding + (control.availableHeight - height) / 2 - color: !control.editable && control.visualFocus ? control.palette.highlight : undefined + color: control.palette.dark + defaultColor: "#353637" source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png" opacity: enabled ? 1 : 0.3 } @@ -84,16 +85,17 @@ T.ComboBox { validator: control.validator font: control.font - color: !control.editable && control.visualFocus ? control.palette.highlight : control.palette.text + color: control.editable ? control.palette.text : control.palette.buttonText selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter background: Rectangle { - visible: control.editable && !control.flat + visible: control.enabled && control.editable && !control.flat border.width: parent && parent.activeFocus ? 2 : 1 - border.color: parent && parent.activeFocus ? control.palette.highlight : Default.buttonColor + border.color: parent && parent.activeFocus ? control.palette.highlight : control.palette.button + color: control.palette.base } } @@ -101,8 +103,7 @@ T.ComboBox { implicitWidth: 140 implicitHeight: 40 - color: !control.editable && control.visualFocus ? (control.pressed ? Default.focusPressedColor : Default.focusLightColor) : - (control.down || popup.visible ? Default.buttonPressedColor : Default.buttonColor) + color: control.down || popup.visible ? control.palette.mid : control.palette.button border.color: control.palette.highlight border.width: !control.editable && control.visualFocus ? 2 : 0 visible: !control.flat || control.down @@ -127,7 +128,7 @@ T.ComboBox { width: parent.width height: parent.height color: "transparent" - border.color: Default.frameLightColor + border.color: control.palette.mid } T.ScrollIndicator.vertical: ScrollIndicator { } |