From facd1e18b5bea237d5128767a93dbc54c4049a0c Mon Sep 17 00:00:00 2001
From: jjjoness <82226755+jjjoness@users.noreply.github.com>
Date: Fri, 16 Jul 2021 16:17:11 +0100
Subject: [PATCH] One hamburger menu to rule them all (#2232)

* Icon changes

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Icon changes to svg files

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
---
 AutomatedTesting/Gem/Code/enabled_gems.cmake               | 7 ++++++-
 .../UI/Outliner/EntityOutliner.qss                         | 2 +-
 .../AzQtComponents/Components/img/UI20/Cards/menu_ico.svg  | 2 +-
 .../AzQtComponents/AzQtComponents/Images/Menu/menu.svg     | 6 +++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/AutomatedTesting/Gem/Code/enabled_gems.cmake b/AutomatedTesting/Gem/Code/enabled_gems.cmake
index dd68e379dd..9ef9e4f874 100644
--- a/AutomatedTesting/Gem/Code/enabled_gems.cmake
+++ b/AutomatedTesting/Gem/Code/enabled_gems.cmake
@@ -20,7 +20,7 @@ set(ENABLED_GEMS
     QtForPython
     PythonAssetBuilder
     Metastream
-    AudioSystem
+
     Camera
     EMotionFX
     PhysX
@@ -51,4 +51,9 @@ set(ENABLED_GEMS
     AWSCore
     AWSClientAuth
     AWSMetrics
+
+
+
+    
+    AudioSystem
 )
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss
index 624c89aad7..9e71cbe194 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss
@@ -8,7 +8,7 @@
 
 OutlinerWidget #m_display_options
 {
-    qproperty-icon: url(:/stylesheet/img/UI20/menu-centered.svg);
+    qproperty-icon: url(:/Menu/menu.svg);
     qproperty-iconSize: 16px 16px;
     qproperty-flat: true;
 }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cards/menu_ico.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cards/menu_ico.svg
index d70293f3a5..236f0f6d7c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cards/menu_ico.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cards/menu_ico.svg
@@ -6,7 +6,7 @@
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="component-header" transform="translate(-426.000000, -6.000000)" fill="#FFFFFF">
             <g id="Buttons-/-Dropdown-button-with-Icon-/-Default" transform="translate(424.000000, 4.000000)">
-                <polygon id="Triangle" transform="translate(19.000000, 8.500000) scale(1, -1) translate(-19.000000, -8.500000) " points="19 7 22 10 16 10"></polygon>
+                <polygon id="Triangle" transform="translate(19.000000, 8.500000) scale(1, -1) translate(-19.000000, -8.500000) " points="20 9 23 12 17 12"></polygon>
                 <g id="Sky-Icon-/-System-/-Menu">
                     <rect id="Rectangle-11" x="2" y="2" width="12" height="2"></rect>
                     <rect id="Rectangle-11" x="2" y="7" width="12" height="2"></rect>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/menu.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/menu.svg
index e97da32e09..117feb534f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/menu.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/menu.svg
@@ -3,9 +3,9 @@
     <title>Buttons / Dropdown button with Icon / no arrow</title>
     <g id="Buttons-/-Dropdown-button-with-Icon-/-no-arrow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Icons-/-System-/-Menu" fill="#FFFFFF">
-            <rect id="Rectangle-11" x="1.33333333" y="2.66666667" width="13.3333333" height="1.33333333"></rect>
-            <rect id="Rectangle-11" x="1.33333333" y="7.33333333" width="13.3333333" height="1.33333333"></rect>
-            <rect id="Rectangle-11" x="1.33333333" y="12" width="13.3333333" height="1.33333333"></rect>
+            <rect id="Rectangle-11" x="4" y="2.66666667" width="12" height="2"></rect>
+            <rect id="Rectangle-11" x="4" y="7.33333333" width="12" height="2"></rect>
+            <rect id="Rectangle-11" x="4" y="12" width="12" height="2"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file