From 0161015746f4c2cbcae487183275214c1243e211 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 11 Jun 2018 15:31:42 +1200 Subject: [PATCH 1/3] Fix setting avatar attachment joint --- .../resources/qml/hifi/dialogs/attachments/Attachment.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); } } From 11178d80f7e6c91eb5abc58834c76e9c801cd75d Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 11 Jun 2018 16:24:45 +1200 Subject: [PATCH 2/3] Fix avatar attachment spinbox min/max values --- interface/resources/qml/controls-uit/SpinBox.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml index 9d63122dbc..2f41c6a46a 100644 --- a/interface/resources/qml/controls-uit/SpinBox.qml +++ b/interface/resources/qml/controls-uit/SpinBox.qml @@ -31,8 +31,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() From 537665c22a1d05edeee88a4f47769b71834ab9cd Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 12 Jun 2018 17:35:53 +1200 Subject: [PATCH 3/3] Fix spinbox not validating the second time an invalid value is entered --- interface/resources/qml/controls-uit/SpinBox.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml index 2f41c6a46a..6654a6a051 100644 --- a/interface/resources/qml/controls-uit/SpinBox.qml +++ b/interface/resources/qml/controls-uit/SpinBox.qml @@ -81,6 +81,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; }