EffectComposer: Make spinboxes HelperWidgets.DoubleSpinBoxes

This way we get proper press-and-drag behavior for them.

Fixes: QDS-11750
Change-Id: I039d72933b533e83ebebf0da36e5c0db81908689
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>

6 files changed, 74 insertions, 76 deletions

diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml
index 61c5dca825..f33d33d9c9 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
+import HelperWidgets as HelperWidgets
 import StudioControls as StudioControls
 import StudioTheme as StudioTheme
 import EffectComposerBackend
@@ -10,19 +11,18 @@ Row {
     width: parent.width
     spacing: 5
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: spinBox
 
         width: 60
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue
-        realTo: uniformMaxValue
-        realValue: uniformValue
-        realStepSize: .01
+        minimumValue: uniformMinValue
+        maximumValue: uniformMaxValue
+        value: uniformValue
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue = realValue
+        onValueModified: uniformValue = value
     }
 
     StudioControls.Slider {
@@ -39,7 +39,7 @@ Row {
         value: uniformValue
         onMoved: {
             uniformValue = value
-            spinBox.realValue = value // binding isn't working for this property so update it
+            spinBox.value = value // binding isn't working for this property so update it
         }
     }
 }
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml
index 86ba9ba78d..5fec6b1de1 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
+import HelperWidgets as HelperWidgets
 import StudioControls as StudioControls
 import StudioTheme as StudioTheme
 import EffectComposerBackend
@@ -10,17 +11,18 @@ Row {
     width: parent.width
     spacing: 5
 
-    StudioControls.SpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: spinBox
 
         width: 60
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        from: uniformMinValue
-        to: uniformMaxValue
+        minimumValue: uniformMinValue
+        maximumValue: uniformMaxValue
         value: uniformValue
-        onValueModified: uniformValue = value
+        stepSize: 1
+        decimals: 0
+        onValueModified: uniformValue = Math.round(value)
     }
 
     StudioControls.Slider {
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml
index 0685b5f41a..cd6a433024 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml
@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Layouts
+import HelperWidgets as HelperWidgets
 import StudioControls as StudioControls
 import StudioTheme as StudioTheme
 import EffectComposerBackend
@@ -11,22 +12,21 @@ RowLayout {
     width: parent.width
     spacing: 0
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vX
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.x
-        realTo: uniformMaxValue.x
-        realValue: uniformValue.x
-        realStepSize: .01
+        minimumValue: uniformMinValue.x
+        maximumValue: uniformMaxValue.x
+        value: uniformValue.x
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.x = realValue
+        onValueModified: uniformValue.x = value
     }
 
     Item { // spacer
@@ -48,22 +48,21 @@ RowLayout {
         Layout.maximumWidth: 20
     }
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vY
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.y
-        realTo: uniformMaxValue.y
-        realValue: uniformValue.y
-        realStepSize: .01
+        minimumValue: uniformMinValue.y
+        maximumValue: uniformMaxValue.y
+        value: uniformValue.y
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.y = realValue
+        onValueModified: uniformValue.y = value
     }
 
     Item { // spacer
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml
index bb33cb68e4..e7ab2ed965 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml
@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Layouts
+import HelperWidgets as HelperWidgets
 import StudioControls as StudioControls
 import StudioTheme as StudioTheme
 import EffectComposerBackend
@@ -11,22 +12,21 @@ RowLayout {
     width: parent.width
     spacing: 0
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vX
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.x
-        realTo: uniformMaxValue.x
-        realValue: uniformValue.x
-        realStepSize: .01
+        minimumValue: uniformMinValue.x
+        maximumValue: uniformMaxValue.x
+        value: uniformValue.x
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.x = realValue
+        onValueModified: uniformValue.x = value
     }
 
     Item { // spacer
@@ -48,22 +48,21 @@ RowLayout {
         Layout.maximumWidth: 20
     }
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vY
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.y
-        realTo: uniformMaxValue.y
-        realValue: uniformValue.y
-        realStepSize: .01
+        minimumValue: uniformMinValue.y
+        maximumValue: uniformMaxValue.y
+        value: uniformValue.y
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.y = realValue
+        onValueModified: uniformValue.y = value
     }
 
     Item { // spacer
@@ -85,22 +84,21 @@ RowLayout {
         Layout.maximumWidth: 20
     }
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vZ
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.z
-        realTo: uniformMaxValue.z
-        realValue: uniformValue.z
-        realStepSize: .01
+        minimumValue: uniformMinValue.z
+        maximumValue: uniformMaxValue.z
+        value: uniformValue.z
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.z = realValue
+        onValueModified: uniformValue.z = value
     }
 
     Item { // spacer
diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml
index bcb3516146..404ccad593 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml
@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Layouts
+import HelperWidgets as HelperWidgets
 import StudioControls as StudioControls
 import StudioTheme as StudioTheme
 import EffectComposerBackend
@@ -11,22 +12,21 @@ RowLayout {
     width: parent.width
     spacing: 0
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vX
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.x
-        realTo: uniformMaxValue.x
-        realValue: uniformValue.x
-        realStepSize: .01
+        minimumValue: uniformMinValue.x
+        maximumValue: uniformMaxValue.x
+        value: uniformValue.x
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.x = realValue
+        onValueModified: uniformValue.x = value
     }
 
     Item { // spacer
@@ -48,22 +48,21 @@ RowLayout {
         Layout.maximumWidth: 20
     }
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vY
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.y
-        realTo: uniformMaxValue.y
-        realValue: uniformValue.y
-        realStepSize: .01
+        minimumValue: uniformMinValue.y
+        maximumValue: uniformMaxValue.y
+        value: uniformValue.y
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.y = realValue
+        onValueModified: uniformValue.y = value
     }
 
     Item { // spacer
@@ -85,22 +84,21 @@ RowLayout {
         Layout.maximumWidth: 20
     }
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vZ
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.z
-        realTo: uniformMaxValue.z
-        realValue: uniformValue.z
-        realStepSize: .01
+        minimumValue: uniformMinValue.z
+        maximumValue: uniformMaxValue.z
+        value: uniformValue.z
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.z = realValue
+        onValueModified: uniformValue.z = value
     }
 
     Item { // spacer
@@ -122,22 +120,21 @@ RowLayout {
         Layout.maximumWidth: 20
     }
 
-    StudioControls.RealSpinBox {
+    HelperWidgets.DoubleSpinBox {
         id: vW
 
         Layout.fillWidth: true
         Layout.minimumWidth: 30
         Layout.maximumWidth: 60
 
-        actionIndicatorVisible: false
         spinBoxIndicatorVisible: false
         inputHAlignment: Qt.AlignHCenter
-        realFrom: uniformMinValue.w
-        realTo: uniformMaxValue.w
-        realValue: uniformValue.w
-        realStepSize: .01
+        minimumValue: uniformMinValue.w
+        maximumValue: uniformMaxValue.w
+        value: uniformValue.w
+        stepSize: .01
         decimals: 2
-        onRealValueModified: uniformValue.w = realValue
+        onValueModified: uniformValue.w = value
     }
 
     Item { // spacer
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
index 115c41e103..a44e8c690b 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
@@ -13,8 +13,10 @@ Item {
     property alias minimumValue: spinBox.realFrom
     property alias maximumValue: spinBox.realTo
     property alias stepSize: spinBox.realStepSize
+    property alias spinBoxIndicatorVisible: spinBox.spinBoxIndicatorVisible
     property alias sliderIndicatorVisible: spinBox.sliderIndicatorVisible
     property alias hover: spinBox.hover
+    property alias inputHAlignment: spinBox.inputHAlignment
 
     property alias pixelsPerUnit: spinBox.pixelsPerUnit