summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/controls
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2018-02-07 13:53:32 +0200
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-02-07 11:59:14 +0000
commitc0aeb462aa908e6c5ace45939d42207e7960a6bd (patch)
tree8a65a699d181b530dac660bfd97d26f2a6ca4eca /src/Authoring/Studio/Palettes/controls
parentda2f03b665582aacc050930fa8b3684741626ebe (diff)
Fix combobox coloring
Task-number: QT3DS-988 Change-Id: I3943d35ecff3741a8b2b78cc2af38964cce9ee1e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/controls')
-rw-r--r--src/Authoring/Studio/Palettes/controls/StyledComboBox.qml4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml b/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
index 9a7bc548..f9afde69 100644
--- a/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
+++ b/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
@@ -40,6 +40,9 @@ ComboBox {
Layout.preferredWidth: _valueWidth
topPadding: 0
bottomPadding: 0
+ // hack to fix the color after Qt.Quick.Controls2 "optimization"
+ property alias color: backgroundBox.color
+
delegate: ItemDelegate {
id: itemDelegate
@@ -108,6 +111,7 @@ ComboBox {
}
background: Rectangle {
+ id: backgroundBox
color: control.enabled ? _studioColor2 : "transparent"
border.width: 0
}