From 1e2005b652d09d8144b95c2e5b48d2518264c028 Mon Sep 17 00:00:00 2001
From: DoinLakeFlyer <don@thegagnes.com>
Date: Sat, 8 Feb 2020 13:23:02 -0800
Subject: [PATCH] Fix sizeToContents support

---
 src/QmlControls/QGCComboBox.qml | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
index 5750f08..10e2106 100644
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@@ -34,17 +34,26 @@ T.ComboBox {
     property bool   sizeToContents: false
     property string alternateText:  ""
 
-    property var    _qgcPal:           QGCPalette { colorGroupEnabled: enabled }
-    property real   _largestTextWidth: 0
-    property real   _popupWidth:       sizeToContents ? _largestTextWidth + leftPadding + rightPadding : control.width
+    property var    _qgcPal:            QGCPalette { colorGroupEnabled: enabled }
+    property real   _largestTextWidth:  0
+    property real   _popupWidth:        sizeToContents ? _largestTextWidth + itemDelegateMetrics.leftPadding + itemDelegateMetrics.rightPadding : control.width
+    property bool   _onCompleted:       false
 
     TextMetrics {
-        id:         textMetrics
-        font:       control.font
+        id:                 textMetrics
+        font.family:        control.font.family
+        font.pointSize:     control.font.pointSize
     }
 
-    onModelChanged: {
-        if (sizeToContents) {
+    ItemDelegate {
+        id:             itemDelegateMetrics
+        visible:        false
+        font.family:    control.font.family
+        font.pointSize: control.font.pointSize
+    }
+
+    function _adjustSizeToContents() {
+        if (_onCompleted && sizeToContents) {
             _largestTextWidth = 0
             for (var i = 0; i < model.length; i++){
                 textMetrics.text = model[i]
@@ -53,6 +62,13 @@ T.ComboBox {
         }
     }
 
+    onModelChanged: _adjustSizeToContents()
+
+    Component.onCompleted: {
+        _onCompleted = true
+        _adjustSizeToContents()
+    }
+
     // The items in the popup
     delegate: ItemDelegate {
         width:  _popupWidth