diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-17 16:35:15 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-18 11:19:43 +0000 |
| commit | 1fbc51b4f285692206a4c0cdf132963638919e6e (patch) | |
| tree | d44130b27a8e843ac95713a8227115b69a2ff304 | |
| parent | 5b59d356f48c1707d57ead15ee6d900371aeeb68 (diff) | |
ComboBox: make delegates respect the popup width
Task-number: QTBUG-55050
Change-Id: I25e84d15ebb61f88cc92ab570471969ec5971c10
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/ComboBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 757af672..01a6d2ab 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -58,7 +58,7 @@ T.ComboBox { //! [delegate] delegate: ItemDelegate { - width: control.width + width: control.popup.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex == index diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index ad29dd22..f13c6922 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -60,7 +60,7 @@ T.ComboBox { Material.foreground: Material.foreground === Material.toolTextColor ? undefined : Material.foreground delegate: MenuItem { - width: control.width + width: control.popup.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData Material.foreground: control.currentIndex === index ? control.Material.accent : control.Material.foreground highlighted: control.highlightedIndex === index diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 007294b3..a8bf58f8 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -57,7 +57,7 @@ T.ComboBox { bottomPadding: padding - 5 delegate: ItemDelegate { - width: control.width + width: control.popup.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData highlighted: control.highlightedIndex === index } |