Skip to content

Q
qgroundcontrol
Commit 1e2005b6 authored by DoinLakeFlyer's avatar DoinLakeFlyer
Browse files
Options

parent 956f4a86
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 7 deletions
src/QmlControls/QGCComboBox.qml
View file @ 1e2005b6
...@@ -36,15 +36,24 @@ T.ComboBox { ...@@ -36,15 +36,24 @@ T.ComboBox {
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property real _largestTextWidth: 0 property real _largestTextWidth: 0
property real _popupWidth: sizeToContents ? _largestTextWidth + leftPadding + rightPadding : control.width property real _popupWidth: sizeToContents ? _largestTextWidth + itemDelegateMetrics.leftPadding + itemDelegateMetrics.rightPadding : control.width
property bool _onCompleted: false
TextMetrics { TextMetrics {
id: textMetrics id: textMetrics
font: control.font font.family: control.font.family
font.pointSize: control.font.pointSize
}
ItemDelegate {
id: itemDelegateMetrics
visible: false
font.family: control.font.family
font.pointSize: control.font.pointSize
} }
onModelChanged: { function _adjustSizeToContents() {
if (sizeToContents) { if (_onCompleted && sizeToContents) {
_largestTextWidth = 0 _largestTextWidth = 0
for (var i = 0; i < model.length; i++){ for (var i = 0; i < model.length; i++){
textMetrics.text = model[i] textMetrics.text = model[i]
...@@ -53,6 +62,13 @@ T.ComboBox { ...@@ -53,6 +62,13 @@ T.ComboBox {
} }
} }
onModelChanged: _adjustSizeToContents()
Component.onCompleted: {
_onCompleted = true
_adjustSizeToContents()
}
// The items in the popup // The items in the popup
delegate: ItemDelegate { delegate: ItemDelegate {
width: _popupWidth width: _popupWidth
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment