From a2d754cebd786741ec7d714576d4462ee3618177 Mon Sep 17 00:00:00 2001
From: Wayne Chen <chen.wayne@outlook.com>
Date: Tue, 26 Mar 2019 10:26:29 -0700
Subject: [PATCH] fixing audio screen with master

---
 interface/resources/qml/hifi/audio/Audio.qml  |  4 ++++
 .../qml/hifi/audio/LoopbackAudio.qml          | 19 +++++++++++--------
 .../qml/hifi/audio/PlaySampleSound.qml        | 17 ++++++++++-------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index 8fdd0368e2..fe86d7d930 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -540,6 +540,8 @@ Rectangle {
             x: margins.paddings;
             width: parent.width - margins.paddings*2
             height: injectorGainSliderTextMetrics.height
+            anchors.top: avatarGainContainer.bottom;
+            anchors.topMargin: 10;
 
             HifiControlsUit.Slider {
                 id: injectorGainSlider
@@ -599,6 +601,8 @@ Rectangle {
             x: margins.paddings;
             width: parent.width - margins.paddings*2
             height: systemInjectorGainSliderTextMetrics.height
+            anchors.top: injectorGainContainer.bottom;
+            anchors.topMargin: 10;
 
             HifiControlsUit.Slider {
                 id: systemInjectorGainSlider
diff --git a/interface/resources/qml/hifi/audio/LoopbackAudio.qml b/interface/resources/qml/hifi/audio/LoopbackAudio.qml
index 74bc0f67dc..8d1099d38c 100644
--- a/interface/resources/qml/hifi/audio/LoopbackAudio.qml
+++ b/interface/resources/qml/hifi/audio/LoopbackAudio.qml
@@ -44,8 +44,11 @@ RowLayout {
     }
 
     HifiControlsUit.Button {
-        text: audioLoopedBack ? qsTr("STOP TESTING") : qsTr("TEST YOUR VOICE");
+        text: audioLoopedBack ? qsTr("STOP TESTING VOICE") : qsTr("TEST YOUR VOICE");
         color: audioLoopedBack ? hifi.buttons.red : hifi.buttons.blue;
+        fontSize: 15;
+        width: 200;
+        height: 32;
         onClicked: {
             if (audioLoopedBack) {
                 loopbackTimer.stop();
@@ -57,11 +60,11 @@ RowLayout {
         }
     }
 
-//    RalewayRegular {
-//        Layout.leftMargin: 2;
-//        size: 14;
-//        color: "white";
-//        font.italic: true
-//        text: audioLoopedBack ? qsTr("Speak in your input") : "";
-//    }
+    RalewayRegular {
+        Layout.leftMargin: 2;
+        size: 14;
+        color: "white";
+        font.italic: true
+        text: audioLoopedBack ? qsTr("Speak in your input") : "";
+    }
 }
diff --git a/interface/resources/qml/hifi/audio/PlaySampleSound.qml b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
index 0eb78f3efe..4675f6087a 100644
--- a/interface/resources/qml/hifi/audio/PlaySampleSound.qml
+++ b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
@@ -59,13 +59,16 @@ RowLayout {
         text: isPlaying ? qsTr("STOP TESTING") : qsTr("TEST YOUR SOUND");
         color: isPlaying ? hifi.buttons.red : hifi.buttons.blue;
         onClicked: isPlaying ? stopSound() : playSound();
+        fontSize: 15;
+        width: 200;
+        height: 32;
     }
 
-//    RalewayRegular {
-//        Layout.leftMargin: 2;
-//        size: 14;
-//        color: "white";
-//        font.italic: true
-//        text: isPlaying ? qsTr("Listen to your output") : "";
-//    }
+    RalewayRegular {
+        Layout.leftMargin: 2;
+        size: 14;
+        color: "white";
+        font.italic: true
+        text: isPlaying ? qsTr("Listen to your output") : "";
+    }
 }