From 3a2780bdf689af2540fc01e0dc756512a967b0d6 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Mon, 30 Oct 2017 10:42:26 -0700
Subject: [PATCH] Enable gain slider in PAL menu to control Avatar MASTER Gain

---
 interface/resources/qml/hifi/NameCard.qml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index fcfff02b72..0adcde3ad9 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -441,7 +441,7 @@ Item {
     Rectangle {
         id: nameCardVUMeter
         // Size
-        width: isMyCard ? myDisplayName.width - 20 : ((gainSlider.value - gainSlider.minimumValue)/(gainSlider.maximumValue - gainSlider.minimumValue)) * (gainSlider.width);
+        width: ((gainSlider.value - gainSlider.minimumValue)/(gainSlider.maximumValue - gainSlider.minimumValue)) * (gainSlider.width);
         height: 8
         // Anchors
         anchors.bottom: isMyCard ? avatarImage.bottom : parent.bottom;
@@ -525,16 +525,14 @@ Item {
         anchors.verticalCenter: nameCardVUMeter.verticalCenter;
         anchors.left: nameCardVUMeter.left;
         // Properties
-        visible: !isMyCard && selected && pal.activeTab == "nearbyTab" && isPresent;
+        visible: (isMyCard || (selected && pal.activeTab == "nearbyTab")) && isPresent;
         value: Users.getAvatarGain(uuid)
         minimumValue: -60.0
         maximumValue: 20.0
         stepSize: 5
         updateValueWhileDragging: true
         onValueChanged: {
-            if (uuid !== "") {
-                updateGainFromQML(uuid, value, false);
-            }
+            updateGainFromQML(uuid, value, false);
         }
         onPressedChanged: {
             if (!pressed) {
@@ -574,7 +572,19 @@ Item {
                 implicitHeight: 16
             }
         }
-    }
+         RalewayRegular {
+            // The slider for my card is special, it controls the master gain
+            id: gainSliderText;
+            visible: isMyCard;
+            text: "master gain";
+            size: hifi.fontSizes.tabularData;
+            anchors.left: parent.right;
+            anchors.leftMargin: 8;
+            color: hifi.colors.baseGrayHighlight;
+            horizontalAlignment: Text.AlignLeft;
+            verticalAlignment: Text.AlignTop;
+        }
+   }
 
     function updateGainFromQML(avatarUuid, sliderValue, isReleased) {
         Users.setAvatarGain(avatarUuid, sliderValue);