diff options
| author | Henning Gruendl <henning.gruendl@qt.io> | 2019-09-02 17:25:51 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-09-03 09:01:50 +0000 |
| commit | 489c9b2e58de5d819302d73bf8d28abd65f251be (patch) | |
| tree | 044890ad49123e8d75391ec8ad3a275ac0b65749 | |
| parent | e6190babdbb2f5d9ea2ef6e5fcf6e7ad00c91847 (diff) | |
QmlDesigner: Fix RealSpinBox Slider issue
Change-Id: Ib5da6c699a94ba42b4e7cbb9913a9caaa570a731
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2 files changed, 2 insertions, 9 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml index d260940c39..fe83e82ee6 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml @@ -81,11 +81,8 @@ T.Popup { } onMoved: { - var currValue = myControl.value myControl.realValue = slider.value - - if (currValue !== myControl.realValue) - myControl.realValueModified() + myControl.realValueModified() } } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxInput.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxInput.qml index 243859e2d8..72a713c282 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxInput.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxInput.qml @@ -106,7 +106,6 @@ TextInput { function calcValue(callback) { var tmp = myControl.realDragRange / StudioTheme.Values.dragLength - var currValue = myControl.realValue myControl.setRealValue(dragHandler.initialValue + (tmp * dragHandler.translation.x * dragHandler.multiplier)) callback() } @@ -164,12 +163,9 @@ TextInput { if (wheel.modifiers & Qt.ShiftModifier) mouseArea.stepSize = myControl.maxStepSize - var currValue = myControl.realValue myControl.valueFromText(textInput.text, myControl.locale) myControl.setRealValue(myControl.realValue + (wheel.angleDelta.y / 120.0 * mouseArea.stepSize)) - - if (currValue !== myControl.realValue) - myControl.realValueModified() + myControl.realValueModified() // Reset stepSize mouseArea.stepSize = myControl.realStepSize |