From ba1cd74ffed6c93ce19f8ab46e63c701ab54c3a4 Mon Sep 17 00:00:00 2001
From: Menithal <menithal@menithal.com>
Date: Sun, 26 Nov 2017 21:58:16 +0200
Subject: [PATCH] 21539: Moved Desktop HMD to None

---
 .../qml/hifi/tablet/OpenVrConfiguration.qml   | 65 ++++++++++---------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index 5e9bf40d41..292a33f4c5 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -55,10 +55,6 @@ Rectangle {
 
     }
 
-
-
-
-
     MouseArea {
         id: mouseArea
 
@@ -101,6 +97,7 @@ Rectangle {
             onClicked: {
                 if (checked) {
                     headPuckBox.checked = false;
+                    hmdInDesktop.checked = false;
                 } else {
                     checked = true;
                 }
@@ -123,6 +120,7 @@ Rectangle {
             onClicked: {
                 if (checked) {
                     headBox.checked = false;
+                    hmdInDesktop.checked = false;
                 } else {
                     checked = true;
                 }
@@ -135,6 +133,37 @@ Rectangle {
             text: "Tracker"
             color: hifi.colors.lightGrayText
         }
+
+        HifiControls.CheckBox {
+            id: hmdInDesktop
+            width: 15
+            height: 15
+            boxRadius: 7
+            visible: viveInDesktop.checked
+
+            anchors.top: viveInDesktop.bottom
+            anchors.topMargin: 5
+            anchors.left: openVrConfiguration.left
+            anchors.leftMargin: leftMargin + 10
+        
+            onClicked: {
+                if (checked) {
+                    headBox.checked = false;
+                    headPuckBox.checked = false;
+                } else {
+                    checked = true;
+                }
+                sendConfigurationSettings();
+            }
+        }
+
+        RalewayBold {
+            id: hmdInDesktopLabel
+            size: 12
+            visible: viveInDesktop.checked
+            text: "None"
+            color: hifi.colors.lightGrayText
+        }
     }
 
     Row {
@@ -800,34 +829,6 @@ Rectangle {
         to: 0
     }
 
-    HifiControls.CheckBox {
-        id: hmdInDesktop
-        width: 15
-        height: 15
-        boxRadius: 7
-
-        anchors.top: viveInDesktop.bottom
-        anchors.topMargin: 5
-        anchors.left: openVrConfiguration.left
-        anchors.leftMargin: leftMargin + 10
-        
-        onClicked: {
-            sendConfigurationSettings();
-        }
-    }
-
-    RalewayBold {
-        id: hmdDesktopText
-        size: 10
-        text: "Use HMD in desktop mode"
-        color: hifi.colors.white
-        
-        anchors {
-            left: hmdInDesktop.right
-            leftMargin: 5
-            verticalCenter: hmdInDesktop.verticalCenter
-        }
-    }
 
     function logAction(action, status) {
         console.log("calibrated from ui");