summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-11-05 13:41:11 +0100
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-11-06 11:37:11 +0100
commitab4edad6ba1b074be7ce309e871845eb9c7091f0 (patch)
tree658d79f40bd12b2385c4815c747e1d5e93f6cf4c /share
parent17fd4d88530cfd9d5701284c9742f0353b57521f (diff)
downloadqt-creator-ab4edad6ba1b074be7ce309e871845eb9c7091f0.tar.gz
QmlDesigner.PropertyEditor: Fix ComboBox drop down menu
We need to style the drop down menu. Change-Id: Ide5845b06336cc6dff08acc7b5814a06ebde6a1b Task-number: QTCREATORBUG-13336 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml9
1 files changed, 8 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
index 9a0388bf19..9254f2262a 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
@@ -30,7 +30,7 @@
import QtQuick 2.1
import QtQuick.Controls 1.1 as Controls
-import QtQuick.Controls.Styles 1.1
+import QtQuick.Controls.Styles 1.2
ComboBoxStyle {
property color borderColor: "#222"
@@ -106,4 +106,11 @@ ComboBoxStyle {
color: textColor
}
}
+
+ __dropDownStyle: MenuStyle {
+ __maxPopupHeight: 600
+ __menuItemType: "comboboxitem"
+ frame: Rectangle {
+ }
+ }
}