From ca76a4d1ab29074a209b190388b2149ea0ff08b5 Mon Sep 17 00:00:00 2001
From: Terry Michaels <miterenc@amazon.com>
Date: Mon, 21 Jun 2021 16:11:50 -0500
Subject: [PATCH] Moved helpers to the top level menu bar above viewport
 (#1464)

---
 .../AzQtComponents/Images/Menu/helpers.svg    | 24 +++++++++++++++++++
 .../AzQtComponents/Images/resources.qrc       |  1 +
 Code/Sandbox/Editor/ViewportTitleDlg.cpp      | 16 +++++++------
 Code/Sandbox/Editor/ViewportTitleDlg.h        |  2 +-
 Code/Sandbox/Editor/ViewportTitleDlg.ui       | 12 ++++++++++
 5 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg

diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg
new file mode 100644
index 0000000000..e782a7066a
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Helpers Icon</title>
+    <defs>
+        <circle id="path-1" cx="8" cy="8" r="8"></circle>
+        <path d="M8.59736328,10.1821289 L8.59736328,9.79394531 C8.59736328,9.07617188 8.86835937,8.71728516 9.84248047,8.15332031 C10.8751953,7.54541016 11.4098633,6.77636719 11.4098633,5.67041016 C11.4098633,4.00048828 10.0255859,2.8359375 7.93085937,2.8359375 C5.68232422,2.8359375 4.40791016,4.09570312 4.37128906,5.89746094 L6.35615234,5.89746094 C6.40009766,5.06982422 6.95673828,4.53515625 7.79902344,4.53515625 C8.63398437,4.53515625 9.190625,5.04052734 9.190625,5.73632812 C9.190625,6.43212891 8.90498047,6.79101562 7.96015625,7.35498047 C6.94941406,7.94824219 6.54658203,8.60742188 6.64179687,9.75732422 L6.65644531,10.1821289 L8.59736328,10.1821289 Z M7.70380859,13.7124023 C8.52412109,13.7124023 9.02949219,13.2436523 9.02949219,12.4892578 C9.02949219,11.7275391 8.52412109,11.2587891 7.70380859,11.2587891 C6.88349609,11.2587891 6.37080078,11.7275391 6.37080078,12.4892578 C6.37080078,13.2436523 6.88349609,13.7124023 7.70380859,13.7124023 Z" id="path-3"></path>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="2nd-ToolBar-v2-(Perspective)-3" transform="translate(-1161.000000, -7.000000)">
+            <g id="2nd-ToolBar-buttons-on-right" transform="translate(1076.000000, 5.000000)">
+                <g id="Helpers-Icon" transform="translate(85.000000, 2.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <use id="Oval" fill="#FFFFFF" xlink:href="#path-1"></use>
+                    <g id="?" fill-rule="nonzero" mask="url(#mask-2)">
+                        <use fill="#909090" xlink:href="#path-3"></use>
+                        <use fill="#3F3F3F" xlink:href="#path-3"></use>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
index bf110c1899..74610dca90 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
@@ -29,5 +29,6 @@
         <file alias="trackview_editor.svg">Menu/trackview_editor.svg</file>
         <file alias="ui_editor.svg">Menu/ui_editor.svg</file>
         <file alias="menu.svg">Menu/menu.svg</file>
+        <file alias="helpers.svg">Menu/helpers.svg</file>
     </qresource>
 </RCC>
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.cpp b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
index 491d31a2ff..5b13b1d308 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.cpp
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
@@ -130,6 +130,7 @@ CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
     SetupCameraDropdownMenu();
     SetupResolutionDropdownMenu();
     SetupViewportInformationMenu();
+    SetupHelpersButton();
     SetupOverflowMenu();
 
     Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, gSettings.bMuteAudio ? m_oMuteAudioRequest : m_oUnmuteAudioRequest);
@@ -211,15 +212,16 @@ void CViewportTitleDlg::SetupViewportInformationMenu()
 
 }
 
+void CViewportTitleDlg::SetupHelpersButton()
+{
+    connect(m_ui->m_helpers, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleHelpers);
+    m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
+}
+
 void CViewportTitleDlg::SetupOverflowMenu()
 {
     // Setup the overflow menu
     QMenu* overFlowMenu = new QMenu(this);
-    m_debugHelpersAction = new QAction("Debug Helpers", overFlowMenu);
-    m_debugHelpersAction->setCheckable(true);
-    m_debugHelpersAction->setChecked(Helpers::IsHelpersShown());
-    connect(m_debugHelpersAction, &QAction::triggered, this, &CViewportTitleDlg::OnToggleHelpers);
-    overFlowMenu->addAction(m_debugHelpersAction);
 
     m_audioMuteAction = new QAction("Mute Audio", overFlowMenu);
     connect(m_audioMuteAction, &QAction::triggered, this, &CViewportTitleDlg::OnBnClickedMuteAudio);
@@ -333,7 +335,7 @@ void CViewportTitleDlg::OnMaximize()
 void CViewportTitleDlg::OnToggleHelpers()
 {
     Helpers::ToggleHelpers();
-    m_debugHelpersAction->setChecked(Helpers::IsHelpersShown());
+    m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
 }
 
 void CViewportTitleDlg::SetNoViewportInfo()
@@ -759,7 +761,7 @@ void CViewportTitleDlg::OnEditorNotifyEvent(EEditorNotifyEvent event)
     switch (event)
     {
     case eNotify_OnDisplayRenderUpdate:
-        m_debugHelpersAction->setChecked(Helpers::IsHelpersShown());
+        m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
         break;
     case eNotify_OnBeginGameMode:
     case eNotify_OnEndGameMode:
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.h b/Code/Sandbox/Editor/ViewportTitleDlg.h
index 255354dcbb..e4670e7873 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.h
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.h
@@ -102,6 +102,7 @@ protected:
     void SetupResolutionDropdownMenu();
     void SetupViewportInformationMenu();
     void SetupOverflowMenu();
+    void SetupHelpersButton();
 
     QString m_title;
 
@@ -172,7 +173,6 @@ protected:
     QAction* m_normalInformationAction = nullptr;
     QAction* m_fullInformationAction = nullptr;
     QAction* m_compactInformationAction = nullptr;
-    QAction* m_debugHelpersAction = nullptr;
     QAction* m_audioMuteAction = nullptr;
     QAction* m_enableVRAction = nullptr;
     QAction* m_enableGridSnappingAction = nullptr;
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.ui b/Code/Sandbox/Editor/ViewportTitleDlg.ui
index 58b4ec70c6..7d8e9d50d4 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.ui
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.ui
@@ -81,6 +81,18 @@
        </property>
      </widget>
    </item>   
+   <item>
+     <widget class="QToolButton" name="m_helpers">
+       <property name="icon">
+         <iconset>
+           <normaloff>:/Menu/helpers.svg</normaloff>:/Menu/helpers.svg
+         </iconset>
+       </property>
+       <property name="checkable">
+         <bool>true</bool>
+       </property>
+     </widget>
+   </item>   
    <item>
      <widget class="QToolButton" name="m_resolutionMenu">
        <property name="icon">