From da011fd042a63df1719f7c27301a39f1d3c83015 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 23 May 2019 13:37:25 -0700
Subject: [PATCH] Fix BUGZ-312; fix BUGZ-311

---
 .../simplifiedUI/settingsApp/audio/Audio.qml  | 23 +++++++------------
 .../hifi/simplifiedUI/settingsApp/vr/VR.qml   | 14 +++++------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
index 9ac72fa3cd..1b5f571d96 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
@@ -60,7 +60,7 @@ Flickable {
             HifiStylesUit.GraphikRegular {
                 id: volumeControlsTitle
                 text: "Volume Controls"
-                Layout.maximumWidth: parent.width
+                Layout.preferredWidth: parent.width
                 height: paintedHeight
                 size: 22
                 color: simplifiedUI.colors.text.white
@@ -68,8 +68,7 @@ Flickable {
 
             SimplifiedControls.Slider {
                 id: peopleVolume
-                anchors.left: parent.left
-                anchors.right: parent.right
+                Layout.preferredWidth: parent.width
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 height: 30
                 labelText: "People Volume"
@@ -96,8 +95,7 @@ Flickable {
 
             SimplifiedControls.Slider {
                 id: environmentVolume
-                anchors.left: parent.left
-                anchors.right: parent.right
+                Layout.preferredWidth: parent.width
                 Layout.topMargin: 2
                 height: 30
                 labelText: "Environment Volume"
@@ -125,8 +123,7 @@ Flickable {
 
             SimplifiedControls.Slider {
                 id: systemSoundVolume
-                anchors.left: parent.left
-                anchors.right: parent.right
+                Layout.preferredWidth: parent.width
                 Layout.topMargin: 2
                 height: 30
                 labelText: "System Sound Volume"
@@ -212,8 +209,7 @@ Flickable {
 
             ListView {
                 id: inputDeviceListView
-                anchors.left: parent.left
-                anchors.right: parent.right
+                Layout.preferredWidth: parent.width
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 interactive: false
                 height: contentItem.height
@@ -228,7 +224,7 @@ Flickable {
                         id: inputDeviceCheckbox
                         anchors.left: parent.left
                         width: parent.width - inputLevel.width
-                        height: paintedHeight
+                        height: 16
                         wrapLabel: false
                         checked: selectedDesktop
                         text: model.devicename
@@ -278,7 +274,6 @@ Flickable {
 
                 id: testYourMicButton
                 enabled: !HMD.active
-                anchors.left: parent.left
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 width: 160
                 height: 32
@@ -313,8 +308,7 @@ Flickable {
 
             ListView {
                 id: outputDeviceListView
-                anchors.left: parent.left
-                anchors.right: parent.right
+                Layout.preferredWidth: parent.width
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 interactive: false
                 height: contentItem.height
@@ -329,7 +323,7 @@ Flickable {
                         id: outputDeviceCheckbox
                         anchors.left: parent.left
                         width: parent.width
-                        height: paintedHeight
+                        height: 16
                         checked: selectedDesktop
                         text: model.devicename
                         wrapLabel: false
@@ -381,7 +375,6 @@ Flickable {
 
                 id: testYourSoundButton
                 enabled: !HMD.active
-                anchors.left: parent.left
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 width: 160
                 height: 32
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
index fc11451b5b..d869f82e12 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
@@ -198,8 +198,7 @@ Flickable {
 
             ListView {
                 id: inputDeviceListView
-                anchors.left: parent.left
-                anchors.right: parent.right
+                Layout.preferredWidth: parent.width
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 interactive: false
                 height: contentItem.height
@@ -214,6 +213,7 @@ Flickable {
                         id: inputDeviceCheckbox
                         anchors.left: parent.left
                         width: parent.width - inputLevel.width
+                        height: 16
                         checked: selectedHMD
                         text: model.devicename
                         wrapLabel: false
@@ -263,7 +263,6 @@ Flickable {
 
                 id: testYourMicButton
                 enabled: HMD.active
-                anchors.left: parent.left
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 width: 160
                 height: 32
@@ -298,8 +297,7 @@ Flickable {
 
             ListView {
                 id: outputDeviceListView
-                anchors.left: parent.left
-                anchors.right: parent.right
+                Layout.preferredWidth: parent.width
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 interactive: false
                 height: contentItem.height
@@ -314,12 +312,13 @@ Flickable {
                         id: outputDeviceCheckbox
                         anchors.left: parent.left
                         width: parent.width
-                        checked: selectedDesktop
+                        height: 16
+                        checked: selectedHMD
                         text: model.devicename
                         wrapLabel: false
                         ButtonGroup.group: outputDeviceButtonGroup
                         onClicked: {
-                            AudioScriptingInterface.setOutputDevice(model.info, true); // `false` argument for Desktop mode setting
+                            AudioScriptingInterface.setOutputDevice(model.info, true); // `true` argument for VR mode setting
                         }
                     }
                 }
@@ -365,7 +364,6 @@ Flickable {
 
                 id: testYourSoundButton
                 enabled: HMD.active
-                anchors.left: parent.left
                 Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
                 width: 160
                 height: 32