summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-09-23 17:46:42 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-25 17:13:45 +0200
commit4e92f2b10a0e4d42e903f6a18b59b33919e238d9 (patch)
tree8c937ffa566ddc15b73188d6046f95113c2524ff
parent77c3f0e33edf5b6031d2460f1760b51359de7db6 (diff)
downloadqtquickcontrols-4e92f2b10a0e4d42e903f6a18b59b33919e238d9.tar.gz
Respect the ComboBoxStyle background implicitWithv5.2.0-alpha1
It is correct that we should use a fixed value here but it would be nice if that can be set by changing the background implicitWidth. Change-Id: Iab81d6681a9d6c84be2c98ce123c8ccbf575f825 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
-rw-r--r--src/controls/Styles/Base/ComboBoxStyle.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml
index 59d8daec..70e2d7b7 100644
--- a/src/controls/Styles/Base/ComboBoxStyle.qml
+++ b/src/controls/Styles/Base/ComboBoxStyle.qml
@@ -66,7 +66,7 @@ Style {
/*! This defines the background of the button. */
property Component background: Item {
- implicitWidth: 100
+ implicitWidth: 125
implicitHeight: 25
BorderImage {
anchors.fill: parent
@@ -157,7 +157,7 @@ Style {
property bool popup: false
anchors.centerIn: parent
anchors.fill: parent
- implicitWidth: 125
+ implicitWidth: backgroundLoader.implicitWidth
implicitHeight: Math.max(labelLoader.implicitHeight + padding.top + padding.bottom, backgroundLoader.implicitHeight)
Loader {