QmlDesigner: Fix editable ComboBox focus issue

This patch fixes an issue were a temporary value wasn't properly
written to the backend, when another item was selected in the form
view.

 * Add a dirty flag to track user modifications
 * Utilize onEditingFinished and onTextEdited from internal TextInput
 * Add full qualification to a few property and function usages

Change-Id: I9afcc17018a03549504b8d38b83fac221145794e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

3 files changed, 43 insertions, 36 deletions

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
index 74414cb592..2332759056 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
@@ -57,21 +57,21 @@ StudioControls.ComboBox {
     actionIndicator.icon.text: extFuncLogic.glyph
     actionIndicator.onClicked: extFuncLogic.show()
 
-    actionIndicator.visible: showExtendedFunctionButton
+    actionIndicator.visible: comboBox.showExtendedFunctionButton
 
     ColorLogic {
         id: colorLogic
         backendValue: comboBox.backendValue
-        onValueFromBackendChanged: invalidate()
+        onValueFromBackendChanged: colorLogic.invalidate()
 
         function invalidate() {
 
-            if (block)
+            if (comboBox.block)
                 return
 
-            block = true
+            comboBox.block = true
 
-            if (manualMapping) {
+            if (comboBox.manualMapping) {
                 comboBox.valueFromBackendChanged()
             } else if (!comboBox.useInteger) {
                 var enumString = comboBox.backendValue.enumeration
@@ -88,33 +88,33 @@ StudioControls.ComboBox {
                     comboBox.currentIndex = index
 
             } else {
-                if (comboBox.currentIndex !== backendValue.value)
-                    comboBox.currentIndex = backendValue.value
+                if (comboBox.currentIndex !== comboBox.backendValue.value)
+                    comboBox.currentIndex = comboBox.backendValue.value
             }
 
-            block = false
+            comboBox.block = false
         }
     }
 
-    onActivated: {
-        if (!__isCompleted)
+    onCompressedActivated: {
+        if (!comboBox.__isCompleted)
             return
 
-        if (backendValue === undefined)
+        if (comboBox.backendValue === undefined)
             return
 
-        if (manualMapping)
+        if (comboBox.manualMapping)
             return
 
         if (!comboBox.useInteger) {
-            backendValue.setEnumeration(comboBox.scope, comboBox.currentText)
+            comboBox.backendValue.setEnumeration(comboBox.scope, comboBox.currentText)
         } else {
-            backendValue.value = comboBox.currentIndex
+            comboBox.backendValue.value = comboBox.currentIndex
         }
     }
 
     Component.onCompleted: {
         colorLogic.invalidate()
-        __isCompleted = true
+        comboBox.__isCompleted = true
     }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
index ce839f77f1..a3f0d2cdca 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
@@ -110,7 +110,7 @@ RowLayout {
                comboBox.handleActivate(comboBox.currentIndex)
         }
 
-        onActivated: comboBox.handleActivate(index)
+        onCompressedActivated: comboBox.handleActivate(index)
 
         function handleActivate(index)
         {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
index cbbf52972e..ec0b93c4a0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
@@ -1,3 +1,5 @@
+
+
 /****************************************************************************
 **
 ** Copyright (C) 2019 The Qt Company Ltd.
@@ -22,7 +24,6 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
-
 import QtQuick 2.12
 import QtQuick.Window 2.12
 import QtQuick.Templates 2.12 as T
@@ -37,17 +38,19 @@ T.ComboBox {
     property bool hover: false // This property is used to indicate the global hover state
     property bool edit: myComboBox.activeFocus
 
+    property bool dirty: false // user modification flag
+
     property alias actionIndicatorVisible: actionIndicator.visible
     property real __actionIndicatorWidth: StudioTheme.Values.squareComponentWidth
     property real __actionIndicatorHeight: StudioTheme.Values.height
 
-    property string __lastAcceptedText: ""
-    signal compressedActivated
+    signal compressedActivated(int index)
 
     width: StudioTheme.Values.squareComponentWidth * 5
     height: StudioTheme.Values.height
 
-    leftPadding: actionIndicator.width - (actionIndicatorVisible ? StudioTheme.Values.border : 0)
+    leftPadding: actionIndicator.width
+                 - (myComboBox.actionIndicatorVisible ? StudioTheme.Values.border : 0)
     rightPadding: popupIndicator.width - StudioTheme.Values.border
     font.pixelSize: StudioTheme.Values.myFontSize
     wheelEnabled: false
@@ -62,14 +65,24 @@ T.ComboBox {
         myControl: myComboBox
         x: 0
         y: 0
-        width: actionIndicator.visible ? __actionIndicatorWidth : 0
-        height: actionIndicator.visible ? __actionIndicatorHeight : 0
+        width: actionIndicator.visible ? myComboBox.__actionIndicatorWidth : 0
+        height: actionIndicator.visible ? myComboBox.__actionIndicatorHeight : 0
     }
 
     contentItem: ComboBoxInput {
         id: comboBoxInput
         myControl: myComboBox
         text: myComboBox.editText
+
+        onEditingFinished: {
+            // Only trigger the signal, if the value was modified
+            if (myComboBox.dirty) {
+                myTimer.stop()
+                myComboBox.dirty = false
+                myComboBox.compressedActivated(myComboBox.find(myComboBox.editText))
+            }
+        }
+        onTextEdited: myComboBox.dirty = true
     }
 
     indicator: CheckIndicator {
@@ -87,31 +100,25 @@ T.ComboBox {
         color: StudioTheme.Values.themeControlOutline
         border.color: StudioTheme.Values.themeControlOutline
         border.width: StudioTheme.Values.border
-        x: actionIndicator.width - (actionIndicatorVisible ? StudioTheme.Values.border : 0)
+        x: actionIndicator.width
+           - (myComboBox.actionIndicatorVisible ? StudioTheme.Values.border : 0)
         width: myComboBox.width - actionIndicator.width
         height: myComboBox.height
     }
 
-    // Set the initial value for __lastAcceptedText
-    Component.onCompleted: __lastAcceptedText = myComboBox.editText
-
-    onAccepted: {
-        if (myComboBox.editText != __lastAcceptedText) {
-            var pos = find(myComboBox.editText)
-            activated(pos)
-        }
-        __lastAcceptedText = myComboBox.editText
-    }
-
     Timer {
         id: myTimer
+        property int activatedIndex
         repeat: false
         running: false
         interval: 100
-        onTriggered: myComboBox.compressedActivated()
+        onTriggered: myComboBox.compressedActivated(myTimer.activatedIndex)
     }
 
-    onActivated: myTimer.restart()
+    onActivated: {
+        myTimer.activatedIndex = index
+        myTimer.restart()
+    }
 
     delegate: ItemDelegate {
         id: myItemDelegate