From 182c92b95116fbb1a62942a710fdab49b0a72d2e Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Tue, 2 Oct 2018 11:23:13 -0700 Subject: [PATCH] fix mac issue --- .../qml/hifi/avatarapp/AdjustWearables.qml | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml index 08c74794fc..361ac838fe 100644 --- a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml +++ b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml @@ -123,7 +123,7 @@ Rectangle { var wearable = wearablesCombobox.model.get(i); if (wearable.id === entityID) { wearablesCombobox.currentIndex = i; - isSoft.enabled = entityHasAvatarJoints(entityID); + softWearableTimer.restart(); break; } } @@ -145,6 +145,20 @@ Rectangle { hoverEnabled: true; } + Timer { + id: softWearableTimer + interval: 500 + running: false + repeat: false + onTriggered: { + var currentWearable = getCurrentWearable(); + var soft = currentWearable ? currentWearable.relayParentJoints : false; + var softEnabled = currentWearable ? entityHasAvatarJoints(currentWearable.id) : false; + isSoft.set(soft); + isSoft.enabled = softEnabled; + } + } + Column { anchors.top: parent.top anchors.topMargin: 12 @@ -262,16 +276,12 @@ Rectangle { var rotation = currentWearable ? currentWearable.localRotationAngles : { x : 0, y : 0, z : 0 }; var scale = currentWearable ? currentWearable.dimensions.x / currentWearable.naturalDimensions.x : 1.0; var joint = currentWearable ? currentWearable.parentJointIndex : -1; - var soft = currentWearable ? currentWearable.relayParentJoints : false; - var softEnabled = currentWearable ? entityHasAvatarJoints(currentWearable.id) : false; - + softWearableTimer.restart(); positionVector.set(position); rotationVector.set(rotation); scalespinner.set(scale); jointsCombobox.set(joint); - isSoft.set(soft); - isSoft.enabled = softEnabled; if (currentWearable) {