From b22745d57a90df73b54f8d967e04c0f3fd6d92f4 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sat, 12 Aug 2017 12:52:35 +0200
Subject: [PATCH] Fix binding loops

---
 .../resources/qml/controls-uit/CheckBox2.qml  |  4 +--
 interface/resources/qml/hifi/audio/Audio.qml  | 30 +++++++------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/interface/resources/qml/controls-uit/CheckBox2.qml b/interface/resources/qml/controls-uit/CheckBox2.qml
index 612e8d2662..ffdb85c1a1 100644
--- a/interface/resources/qml/controls-uit/CheckBox2.qml
+++ b/interface/resources/qml/controls-uit/CheckBox2.qml
@@ -32,8 +32,8 @@ CheckBox {
 
     indicator: Rectangle {
         id: box
-        width: boxSize
-        height: boxSize
+        implicitWidth: boxSize
+        implicitHeight: boxSize
         radius: boxRadius
         x: checkBox.leftPadding
         y: parent.height / 2 - height / 2
diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index 3d3a9ceeaa..aa2e0e32d5 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -41,13 +41,13 @@ Rectangle {
     //recalculates dynamically in case of UI size is changed
     QtObject {
         id: margins
-        property real paddings: parent.width / 20.25
+        property real paddings: root.width / 20.25
 
-        property real sizeCheckBox: parent.width / 13.5
-        property real sizeText: parent.width / 2.5
-        property real sizeLevel: parent.width / 5.8
-        property real sizeDesktop: parent.width / 5.8
-        property real sizeVR: parent.width / 13.5
+        property real sizeCheckBox: root.width / 13.5
+        property real sizeText: root.width / 2.5
+        property real sizeLevel: root.width / 5.8
+        property real sizeDesktop: root.width / 5.8
+        property real sizeVR: root.width / 13.5
     }
 
     Column {
@@ -166,7 +166,6 @@ Rectangle {
                 RalewaySemiBold {
                     Layout.minimumWidth: margins.sizeCheckBox + margins.sizeText
                     Layout.maximumWidth: margins.sizeCheckBox + margins.sizeText
-                    Layout.alignment: Qt.AlignVCenter
                     clip: true
                     size: 16;
                     color: "white";
@@ -177,7 +176,6 @@ Rectangle {
                 Item {
                     Layout.minimumWidth: margins.sizeLevel
                     Layout.maximumWidth: margins.sizeLevel
-                    Layout.alignment: Qt.AlignVCenter
                     height: 8;
                     InputLevel {
                         visible: (isVR && selectedHMD) || (!isVR && selectedDesktop);
@@ -187,8 +185,7 @@ Rectangle {
                 AudioControls.CheckBox {
                     Layout.minimumWidth: margins.sizeDesktop
                     Layout.maximumWidth: margins.sizeDesktop
-                    leftPadding: margins.sizeDesktop - implicitWidth/2
-                    Layout.alignment: Qt.AlignCenter
+                    leftPadding: margins.sizeDesktop/2 - boxSize/2
                     checked: selectedDesktop;
                     onClicked: {
                         if (checked) {
@@ -200,8 +197,7 @@ Rectangle {
                 AudioControls.CheckBox {
                     Layout.minimumWidth: margins.sizeVR
                     Layout.maximumWidth: margins.sizeVR
-                    Layout.alignment: Qt.AlignCenter
-                    leftPadding: margins.sizeVR - implicitWidth/2
+                    leftPadding: margins.sizeVR/2 - boxSize/2
                     checked: selectedHMD;
                     onClicked: {
                         if (checked) {
@@ -266,14 +262,13 @@ Rectangle {
             clip: true;
             model: Audio.devices.output;
             delegate: RowLayout {
-                width: inputView.width;
+                width: outputView.width;
                 height: 36;
                 spacing: 0
 
                 RalewaySemiBold {
                     Layout.minimumWidth: margins.sizeCheckBox + margins.sizeText
                     Layout.maximumWidth: margins.sizeCheckBox + margins.sizeText
-                    Layout.alignment: Qt.AlignVCenter
                     clip: true
                     size: 16;
                     color: "white";
@@ -284,14 +279,12 @@ Rectangle {
                 Item {
                     Layout.minimumWidth: margins.sizeLevel
                     Layout.maximumWidth: margins.sizeLevel
-                    Layout.alignment: Qt.AlignVCenter
                     height: 8;
                 }
                 AudioControls.CheckBox {
                     Layout.minimumWidth: margins.sizeDesktop
                     Layout.maximumWidth: margins.sizeDesktop
-                    leftPadding: margins.sizeDesktop - implicitWidth/2
-                    Layout.alignment: Qt.AlignCenter
+                    leftPadding: margins.sizeDesktop/2 - boxSize/2
                     checked: selectedDesktop;
                     onClicked: {
                         if (checked) {
@@ -302,8 +295,7 @@ Rectangle {
                 AudioControls.CheckBox {
                     Layout.minimumWidth: margins.sizeVR
                     Layout.maximumWidth: margins.sizeVR
-                    Layout.alignment: Qt.AlignCenter
-                    leftPadding: margins.sizeVR - implicitWidth/2
+                    leftPadding: margins.sizeVR/2 - boxSize/2
                     checked: selectedHMD;
                     onClicked: {
                         if (checked) {