summaryrefslogtreecommitdiffstats
path: root/src/settingsui/timedate/TimeDate.qml
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-09-29 13:05:35 +0300
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-22 10:41:32 +0000
commit1b5cb34a106560e5ee7d2d00c77fddf61ff4c327 (patch)
treea45ad44cdc66e826acb363f245bd8f8cc3b0122c /src/settingsui/timedate/TimeDate.qml
parent366c0c0e392c27624f22d3bb3c0e6732e1de04f6 (diff)
Fix CustomComboBox
It's not possible to calculate popup height from the ComboBox y coordinate, it does not work with columns and rows. Height must be set by the user of the component who can calculate it correctly. Added itemsVisible property for quick height selection. Task-number: QTBUG-63091 Change-Id: I3f1a86545b7df58f453b98ce2e1f3a7bce9cc732 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/settingsui/timedate/TimeDate.qml')
-rw-r--r--src/settingsui/timedate/TimeDate.qml3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml
index c8719e2..9110d80 100644
--- a/src/settingsui/timedate/TimeDate.qml
+++ b/src/settingsui/timedate/TimeDate.qml
@@ -110,13 +110,12 @@ Item {
Row {
leftPadding: pluginMain.margin
- height: 500
CustomComboBox {
id: timeZoneBox
width: automaticButton.width + manualButton.width + pluginMain.spacing
height: pluginMain.buttonHeight
textRole: "id"
- popup.height: 200
+ itemsVisible: 7
model: TimezonesFilter
delegate: ItemDelegate {
id: timeZoneDelegate