From f43c376a6af7ce401bf9bb154a9b2a9e7cea8fa4 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 14 May 2019 12:41:56 -0700
Subject: [PATCH] Tweak top bar

---
 .../inputDeviceButton/InputDeviceButton.qml   | 15 +++++++------
 .../simplifiedUI/topBar/SimplifiedTopBar.qml  | 21 +++++++++----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
index 9357dd3d42..4cd5b9a96f 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
@@ -48,10 +48,9 @@ Rectangle {
         }
     }
 
-    height: parent.height;
-    width: 40;
+    height: 30;
+    width: 34;
 
-    radius: 5;
     opacity: 0.7;
 
     onLevelChanged: {
@@ -108,11 +107,11 @@ Rectangle {
     }
 
     Item {
-        id: icon;
-        width: parent.width - bar.width - bar.anchors.leftMargin;
-        height: parent.height - 4;
+        id: icon
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
+        width: parent.width - bar.width - bar.anchors.leftMargin
+        height: parent.height
 
         Item {
             anchors.fill: parent
@@ -143,8 +142,8 @@ Rectangle {
             verticalCenter: icon.verticalCenter;
         }
 
-        width: 6;
-        height: parent.height - 12;
+        width: 4;
+        height: parent.height;
 
         Rectangle { // base
             id: baseBar
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
index 6f35cc5459..2c1e632cff 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
@@ -116,11 +116,11 @@ Rectangle {
 
     Item {
         id: avatarButtonContainer
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
+        anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
         anchors.leftMargin: 16
-        width: height
+        width: 48
+        height: width
 
         AnimatedImage {
             visible: avatarButtonImage.source === ""
@@ -192,20 +192,19 @@ Rectangle {
 
     InputDeviceButton.InputDeviceButton {
         id: inputDeviceButton
+        anchors.verticalCenter: parent.verticalCenter
         anchors.left: avatarButtonContainer.right
         anchors.leftMargin: 8
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
     }
 
 
     Item {
         id: outputDeviceButtonContainer
+        anchors.verticalCenter: parent.verticalCenter
         anchors.left: inputDeviceButton.right
-        anchors.leftMargin: 8
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        width: 40
+        anchors.leftMargin: 24
+        width: 20
+        height: width
 
         HifiStylesUit.HiFiGlyphs {
             property bool outputMuted: false
@@ -213,9 +212,9 @@ Rectangle {
             text: (outputDeviceButton.outputMuted ? simplifiedUI.glyphs.vol_0 : simplifiedUI.glyphs.vol_3)
             color: (outputDeviceButton.outputMuted ? simplifiedUI.colors.controls.outputVolumeButton.text.muted : simplifiedUI.colors.controls.outputVolumeButton.text.noisy)
             opacity: outputDeviceButtonMouseArea.containsMouse ? 1.0 : 0.7
-            size: 40
+            size: 32
             anchors.centerIn: parent
-            width: 35
+            width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
             MouseArea {