diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml index 7302901a06..52d5a2eb99 100644 --- a/interface/resources/qml/controls-uit/SpinBox.qml +++ b/interface/resources/qml/controls-uit/SpinBox.qml @@ -35,8 +35,8 @@ SpinBox { property real maximumValue: 0.0 property real realValue: 0.0 - property real realFrom: 0.0 - property real realTo: 100.0 + property real realFrom: minimumValue + property real realTo: maximumValue property real realStepSize: 1.0 signal editingFinished() @@ -86,6 +86,7 @@ SpinBox { } valueFromText: function(text, locale) { + spinBox.value = 0; // Force valueChanged signal to be emitted so that validator fires. return Number.fromLocaleString(locale, text)*factor; } diff --git a/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml b/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml index 30e03bd02e..54270c2d06 100644 --- a/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml +++ b/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml @@ -119,8 +119,8 @@ Item { colorScheme: hifi.colorSchemes.dark currentIndex: attachment ? model.indexOf(attachment.jointName) : -1 onCurrentIndexChanged: { - if (completed && attachment && currentIndex != -1 && currentText && currentText !== attachment.jointName) { - attachment.jointName = currentText; + if (completed && attachment && currentIndex != -1 && attachment.jointName !== model[currentIndex]) { + attachment.jointName = model[currentIndex]; updateAttachment(); } }