Merge branch 'master' into wip/timeline

Change-Id: If6e06be72a24372eef95339f55ffda24888eebc3

2 files changed, 19 insertions, 5 deletions

diff --git a/src/Authoring/Studio/Palettes/controls/FloatTextField.qml b/src/Authoring/Studio/Palettes/controls/FloatTextField.qml
index 25680090..db0b3347 100644
--- a/src/Authoring/Studio/Palettes/controls/FloatTextField.qml
+++ b/src/Authoring/Studio/Palettes/controls/FloatTextField.qml
@@ -158,9 +158,13 @@ TextField {
                 if (draggingActive) {
                     var delta = _mouseHelper.delta().x;
                     if (delta !== 0) {
-                        floatTextFieldId.text =
-                                Number(parseFloat(floatTextFieldId.text)
-                                       + delta).toFixed(validator.decimals);
+                        if (floatTextFieldId.text !== "") {
+                            floatTextFieldId.text = Number(parseFloat(floatTextFieldId.text)
+                                                           + delta).toFixed(validator.decimals);
+                        } else {
+                            floatTextFieldId.text = Number(delta).toFixed(validator.decimals);
+                        }
+
                         if (!rateLimiter.running)
                             rateLimiter.start();
                     }
@@ -179,8 +183,13 @@ TextField {
                 delta = 10.0;
             if (event.key === Qt.Key_Down)
                 delta = -delta;
-            floatTextFieldId.text = Number(parseFloat(floatTextFieldId.text)
-                                           + delta).toFixed(validator.decimals);
+            if (floatTextFieldId.text !== "") {
+                floatTextFieldId.text = Number(parseFloat(floatTextFieldId.text)
+                                               + delta).toFixed(validator.decimals);
+            } else {
+                floatTextFieldId.text = Number(delta).toFixed(validator.decimals);
+            }
+
             if (!rateLimiter.running)
                 rateLimiter.start();
         }
diff --git a/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml b/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
index 81760abd..f9afde69 100644
--- a/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
+++ b/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
@@ -40,6 +40,9 @@ ComboBox {
     Layout.preferredWidth: _valueWidth
     topPadding: 0
     bottomPadding: 0
+    // hack to fix the color after Qt.Quick.Controls2 "optimization"
+    property alias color: backgroundBox.color
+
     delegate: ItemDelegate {
         id: itemDelegate
 
@@ -87,6 +90,7 @@ ComboBox {
         x: control.width - width - 2
         y: control.topPadding + (control.availableHeight - height) / 2
         source: _resDir + "arrow_down.png"
+        rotation: control.popup.visible ? 180 : 0
     }
 
     contentItem: StyledTextField {
@@ -107,6 +111,7 @@ ComboBox {
     }
 
     background: Rectangle {
+        id: backgroundBox
         color: control.enabled ? _studioColor2 : "transparent"
         border.width: 0
     }