From ee6de9e868cffb456c6521f9d1ee445cd32bbfb4 Mon Sep 17 00:00:00 2001 From: motofckr9k Date: Fri, 19 Jun 2020 21:10:48 +0200 Subject: [PATCH] Move "Test your voice" and "Test your sound" to top of their category --- interface/resources/qml/hifi/audio/Audio.qml | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml index e1599206ff..cfa5ca6d96 100644 --- a/interface/resources/qml/hifi/audio/Audio.qml +++ b/interface/resources/qml/hifi/audio/Audio.qml @@ -546,11 +546,22 @@ Rectangle { text: qsTr("Choose input device"); } } + + AudioControls.LoopbackAudio { + id: loopbackAudio + x: margins.paddings + anchors.top: inputDeviceHeader.bottom; + anchors.topMargin: 10; + visible: (bar.currentIndex === 1 && isVR) || + (bar.currentIndex === 0 && !isVR); + anchors { left: parent.left; leftMargin: margins.paddings } + } + ListView { id: inputView; width: rightMostInputLevelPos; - anchors.top: inputDeviceHeader.bottom; + anchors.top: loopbackAudio.bottom; anchors.topMargin: 10; x: margins.paddings interactive: false; @@ -596,17 +607,6 @@ Rectangle { } } - AudioControls.LoopbackAudio { - id: loopbackAudio - x: margins.paddings - anchors.top: inputView.bottom; - anchors.topMargin: 10; - - visible: (bar.currentIndex === 1 && isVR) || - (bar.currentIndex === 0 && !isVR); - anchors { left: parent.left; leftMargin: margins.paddings } - } - Separator { id: thirdSeparator; anchors.top: loopbackAudio.visible ? loopbackAudio.bottom : inputView.bottom; @@ -641,14 +641,21 @@ Rectangle { text: qsTr("Choose output device"); } } - + + AudioControls.PlaySampleSound { + id: playSampleSound + x: margins.paddings + anchors.top: outputDeviceHeader.bottom; + anchors.topMargin: 10; + } + ListView { id: outputView width: parent.width - margins.paddings*2 x: margins.paddings; interactive: false; height: contentHeight; - anchors.top: outputDeviceHeader.bottom; + anchors.top: playSampleSound.bottom; anchors.topMargin: 10; clip: true; model: AudioScriptingInterface.devices.output; @@ -676,19 +683,12 @@ Rectangle { } } } - - AudioControls.PlaySampleSound { - id: playSampleSound - x: margins.paddings - anchors.top: outputView.bottom; - anchors.topMargin: 10; - } // Spacer item Item { - anchors.top: playSampleSound.bottom; - anchors.topMargin: 5; + anchors.top: outputView.bottom; + anchors.topMargin: 10; } } -} +} \ No newline at end of file