From 7c4a0545c4dacee27323356a6c741b301690c729 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Aug 2019 12:51:34 -0700
Subject: [PATCH] BUGZ-1327: Fix PTT icon when PTTing and clipping

---
 .../simplifiedUI/inputDeviceButton/InputDeviceButton.qml  | 8 ++++----
 .../inputDeviceButton/images/mic-ptt-clip-i.svg           | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-clip-i.svg

diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
index c7f938b986..7f007d10df 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
@@ -33,6 +33,7 @@ Rectangle {
     readonly property string unmutedIcon: "images/mic-unmute-i.svg"
     readonly property string mutedIcon: "images/mic-mute-i.svg"
     readonly property string pushToTalkIcon: "images/mic-ptt-i.svg"
+    readonly property string pushToTalkClippingIcon: "images/mic-ptt-clip-i.svg"
     readonly property string pushToTalkMutedIcon: "images/mic-ptt-mute-i.svg"
     readonly property string clippingIcon: "images/mic-clip-i.svg"
     readonly property string gatedIcon: "images/mic-gate-i.svg"
@@ -107,7 +108,7 @@ Rectangle {
         anchors.verticalCenter: parent.verticalCenter
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.rightMargin: 2
-        width: pushToTalk ? 16 : (muted ? 20 : 16)
+        width: pushToTalk ? (clipping && pushingToTalk ? 4 : 16) : (muted ? 20 : 16)
         height: 22
 
         Item {
@@ -115,7 +116,7 @@ Rectangle {
             Image {
                 id: image
                 visible: false
-                source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon :
+                source: pushToTalk ? (clipping && pushingToTalk ? pushToTalkClippingIcon : pushToTalkIcon) : muted ? mutedIcon :
                     clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon
                 anchors.fill: parent
             }
@@ -170,8 +171,7 @@ Rectangle {
             Image {
                 id: maskImage
                 visible: false
-                source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon :
-                    clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon
+                source: image.source
                 anchors.top: parent.top
                 anchors.left: parent.left
                 width: parent.width
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-clip-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-clip-i.svg
new file mode 100644
index 0000000000..b016adb8e5
--- /dev/null
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-clip-i.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.6, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3.3 19.6" style="enable-background:new 0 0 3.3 19.6;" xml:space="preserve">
+<path d="M1.6,16.3C0.7,16.3,0,17.1,0,18c0,0.9,0.7,1.6,1.6,1.6c0.9,0,1.6-0.7,1.6-1.6C3.3,17.1,2.5,16.3,1.6,16.3z M1.5,14.6
+	c0.5,0,0.9-0.1,1.2-0.4c0.3-0.3,0.5-0.8,0.5-1.2V9.8v-5V1.7c0-0.9-0.6-1.6-1.5-1.7C1.3,0,0.9,0.1,0.5,0.4C0.2,0.7,0,1.2,0,1.6v3.1v5
+	v3.1C0,13.8,0.6,14.5,1.5,14.6z"/>
+</svg>