From 4762867856090c7e3a8363d361849f727ba2fa73 Mon Sep 17 00:00:00 2001
From: hultonha <hultonha@amazon.co.uk>
Date: Tue, 20 Jul 2021 18:01:15 +0100
Subject: [PATCH 1/3] fix for focus being removed from main viewport widget
 when interacting with viewport ui elements

Signed-off-by: hultonha <hultonha@amazon.co.uk>
---
 Code/Editor/ShortcutDispatcher.cpp            |   1 -
 .../ViewportUi/ButtonGroup.cpp                |   7 +-
 .../ViewportUi/ViewportUiCluster.cpp          |  42 ++++---
 .../ViewportUi/ViewportUiCluster.h            |   9 +-
 .../ViewportUi/ViewportUiDisplay.cpp          | 115 +++++++-----------
 .../ViewportUi/ViewportUiDisplay.h            |  36 +++---
 .../ViewportUi/ViewportUiWidgetCallbacks.h    |   2 +-
 7 files changed, 95 insertions(+), 117 deletions(-)

diff --git a/Code/Editor/ShortcutDispatcher.cpp b/Code/Editor/ShortcutDispatcher.cpp
index df7b25eb55..50e309d955 100644
--- a/Code/Editor/ShortcutDispatcher.cpp
+++ b/Code/Editor/ShortcutDispatcher.cpp
@@ -346,7 +346,6 @@ bool ShortcutDispatcher::eventFilter(QObject* obj, QEvent* ev)
 
     case QEvent::Shortcut:
         return shortcutFilter(obj, static_cast<QShortcutEvent*>(ev));
-        break;
 
     case QEvent::MouseButtonPress:
         if (!s_lastFocus || !IsAContainerForB(qobject_cast<QWidget*>(obj), s_lastFocus))
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
index eb846ddde8..e933940d95 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
@@ -45,11 +45,11 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         if (name.empty())
         {
-            m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, buttonId)});
+            m_buttons.insert({ buttonId, AZStd::make_unique<Button>(icon, buttonId) });
         }
         else
         {
-            m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, name, buttonId)});
+            m_buttons.insert({ buttonId, AZStd::make_unique<Button>(icon, name, buttonId) });
         }
         return buttonId;
     }
@@ -73,7 +73,8 @@ namespace AzToolsFramework::ViewportUi::Internal
         return buttons;
     }
 
-    void ButtonGroup::ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler) {
+    void ButtonGroup::ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler)
+    {
         handler.Connect(m_buttonTriggeredEvent);
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
index 65ac3b5e2c..43d73c064d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
@@ -15,13 +15,12 @@ namespace AzToolsFramework::ViewportUi::Internal
 {
     ViewportUiCluster::ViewportUiCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup)
         : QToolBar(nullptr)
-        , m_buttonGroup(buttonGroup)
+        , m_buttonGroup(AZStd::move(buttonGroup))
     {
         setOrientation(Qt::Orientation::Vertical);
         setStyleSheet("background: black;");
 
-        const AZStd::vector<Button*> buttons = buttonGroup->GetButtons();
-        for (auto button : buttons)
+        for (auto button : m_buttonGroup->GetButtons())
         {
             RegisterButton(button);
         }
@@ -35,10 +34,12 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         AddClusterAction(
             action,
-            [this, button]() {
+            [this, button]()
+            {
                 m_buttonGroup->PressButton(button->m_buttonId);
             },
-            [button](QAction* action) {
+            [button](QAction* action)
+            {
                 action->setChecked(button->m_state == Button::State::Selected);
             });
 
@@ -47,8 +48,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     void ViewportUiCluster::RemoveButton(ButtonId buttonId)
     {
-        if (auto actionEntry = m_buttonActionMap.find(buttonId);
-            actionEntry != m_buttonActionMap.end())
+        if (auto actionEntry = m_buttonActionMap.find(buttonId); actionEntry != m_buttonActionMap.end())
         {
             auto action = actionEntry->second;
             RemoveClusterAction(action);
@@ -57,8 +57,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     }
 
     void ViewportUiCluster::AddClusterAction(
-        QAction* action, const AZStd::function<void()>& callback,
-        const AZStd::function<void(QAction*)>& updateCallback)
+        QAction* action, const AZStd::function<void()>& callback, const AZStd::function<void(QAction*)>& updateCallback)
     {
         if (!action)
         {
@@ -81,10 +80,12 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
 
         // register the action
-        m_widgetCallbacks.AddWidget(action, [updateCallback](QPointer<QObject> object)
-        {
-            updateCallback(static_cast<QAction*>(object.data()));
-        });
+        m_widgetCallbacks.AddWidget(
+            action,
+            [updateCallback](QPointer<QObject> object)
+            {
+                updateCallback(static_cast<QAction*>(object.data()));
+            });
     }
 
     void ViewportUiCluster::RemoveClusterAction(QAction* action)
@@ -112,10 +113,13 @@ namespace AzToolsFramework::ViewportUi::Internal
         if (m_lockedButtonId.has_value() && isLocked)
         {
             // find the button to extract the old icon (without overlay)
-            auto findLocked = [this](const Button* button) { return (button->m_buttonId == m_lockedButtonId); };
+            auto findLocked = [this](const Button* button)
+            {
+                return (button->m_buttonId == m_lockedButtonId);
+            };
             if (auto lockedButtonIt = AZStd::find_if(buttons.begin(), buttons.end(), findLocked); lockedButtonIt != buttons.end())
             {
-                // get the action corresponding to the lockedButtonId 
+                // get the action corresponding to the lockedButtonId
                 if (auto actionEntry = m_buttonActionMap.find(m_lockedButtonId.value()); actionEntry != m_buttonActionMap.end())
                 {
                     // remove the overlay
@@ -125,14 +129,18 @@ namespace AzToolsFramework::ViewportUi::Internal
             }
         }
 
-        auto found = [buttonId](Button* button) { return (button->m_buttonId == buttonId); };
+        auto found = [buttonId](Button* button)
+        {
+            return (button->m_buttonId == buttonId);
+        };
+
         if (auto buttonIt = AZStd::find_if(buttons.begin(), buttons.end(), found); buttonIt != buttons.end())
         {
             QIcon newIcon;
 
             if (isLocked)
             {
-                // overlay the locked icon ontop of the button's icon
+                // overlay the locked icon on top of the button's icon
                 QPixmap comboPixmap(24, 24);
                 comboPixmap.fill(Qt::transparent);
                 QPixmap firstImage(QString((*buttonIt)->m_icon.c_str()));
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
index c417d9b33c..34f7ad6f22 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
@@ -12,16 +12,16 @@
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
-#include <QToolBar>
+
 #include <QPainter>
+#include <QToolBar>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
     class ButtonGroup;
 
     //! Helper class to make clusters (toolbars) for display in Viewport UI.
-    class ViewportUiCluster
-        : public QToolBar
+    class ViewportUiCluster : public QToolBar
     {
         Q_OBJECT
 
@@ -45,8 +45,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     private:
         //! Adds an action to the Viewport UI Cluster.
         void AddClusterAction(
-            QAction* action, const AZStd::function<void()>& callback = {},
-            const AZStd::function<void(QAction*)>& updateCallback = {});
+            QAction* action, const AZStd::function<void()>& callback = {}, const AZStd::function<void(QAction*)>& updateCallback = {});
         //! Removes an action from the Viewport UI Cluster.
         void RemoveClusterAction(QAction* action);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index 337cd586f9..b2e836a649 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -12,8 +12,8 @@
 #include <AzFramework/Viewport/ViewportScreen.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
-#include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiSwitcher.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiTextField.h>
 #include <QWidget>
@@ -35,9 +35,9 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
-    static Qt::Alignment GetQtAlignment(Alignment align)
+    static Qt::Alignment GetQtAlignment(const Alignment alignment)
     {
-        switch (align)
+        switch (alignment)
         {
         case Alignment::TopRight:
             return Qt::AlignTop | Qt::AlignRight;
@@ -53,7 +53,7 @@ namespace AzToolsFramework::ViewportUi::Internal
             return Qt::AlignBottom;
         }
 
-        AZ_Assert(false, "ViewportUI", "Unhandled ViewportUI Alignment %d", static_cast<int>(align));
+        AZ_Assert(false, "ViewportUI", "Unhandled ViewportUI Alignment %d", static_cast<int>(alignment));
         return Qt::AlignTop;
     }
 
@@ -72,7 +72,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         UnparentWidgets(m_viewportUiElements);
     }
 
-    void ViewportUiDisplay::AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, const Alignment align)
+    void ViewportUiDisplay::AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, const Alignment alignment)
     {
         if (!buttonGroup.get())
         {
@@ -82,11 +82,10 @@ namespace AzToolsFramework::ViewportUi::Internal
         auto viewportUiCluster = AZStd::make_shared<ViewportUiCluster>(buttonGroup);
         auto id = AddViewportUiElement(viewportUiCluster);
         buttonGroup->SetViewportUiElementId(id);
-        PositionViewportUiElementAnchored(id, GetQtAlignment(align));
+        PositionViewportUiElementAnchored(id, GetQtAlignment(alignment));
     }
 
-    void ViewportUiDisplay::AddClusterButton(
-        const ViewportUiElementId clusterId, Button* button)
+    void ViewportUiDisplay::AddClusterButton(const ViewportUiElementId clusterId, Button* button)
     {
         if (auto viewportUiCluster = qobject_cast<ViewportUiCluster*>(GetViewportUiElement(clusterId).get()))
         {
@@ -102,7 +101,8 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
-    void ViewportUiDisplay::SetClusterButtonTooltip(const ViewportUiElementId clusterId, const ButtonId buttonId, const AZStd::string& tooltip)
+    void ViewportUiDisplay::SetClusterButtonTooltip(
+        const ViewportUiElementId clusterId, const ButtonId buttonId, const AZStd::string& tooltip)
     {
         if (auto viewportUiCluster = qobject_cast<ViewportUiCluster*>(GetViewportUiElement(clusterId).get()))
         {
@@ -126,7 +126,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
-    void ViewportUiDisplay::AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup, const Alignment align)
+    void ViewportUiDisplay::AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup, const Alignment alignment)
     {
         if (!buttonGroup.get())
         {
@@ -136,7 +136,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         auto viewportUiSwitcher = AZStd::make_shared<ViewportUiSwitcher>(buttonGroup);
         auto id = AddViewportUiElement(viewportUiSwitcher);
         buttonGroup->SetViewportUiElementId(id);
-        PositionViewportUiElementAnchored(id, GetQtAlignment(align));
+        PositionViewportUiElementAnchored(id, GetQtAlignment(alignment));
     }
 
     void ViewportUiDisplay::AddSwitcherButton(const ViewportUiElementId clusterId, Button* button)
@@ -199,11 +199,12 @@ namespace AzToolsFramework::ViewportUi::Internal
             const ViewportUiElementInfo& elementInfo = element.second;
             if (!elementInfo.m_anchored)
             {
-                const auto screenPoint = AzFramework::WorldToScreen(
-                    elementInfo.m_worldPosition, AzToolsFramework::GetCameraState(m_viewportId));
+                const auto screenPoint =
+                    AzFramework::WorldToScreen(elementInfo.m_worldPosition, AzToolsFramework::GetCameraState(m_viewportId));
                 elementInfo.m_widget->move(screenPoint.m_x, screenPoint.m_y);
             }
         }
+
         PositionUiOverlayOverRenderViewport();
     }
 
@@ -217,7 +218,6 @@ namespace AzToolsFramework::ViewportUi::Internal
         ViewportUiElementId newId = ViewportUiElementId(++m_numViewportElements);
         ViewportUiElementInfo newElement{ widget, newId, true };
         m_viewportUiElements.insert({ newId, newElement });
-        SetUiOverlayContents(widget.get());
         return newId;
     }
 
@@ -234,8 +234,11 @@ namespace AzToolsFramework::ViewportUi::Internal
     ViewportUiElementId ViewportUiDisplay::GetViewportUiElementId(QPointer<QWidget> widget)
     {
         if (auto element = AZStd::find_if(
-            m_viewportUiElements.begin(), m_viewportUiElements.end(),
-            [widget](const auto& it) { return it.second.m_widget.get() == widget; });
+                m_viewportUiElements.begin(), m_viewportUiElements.end(),
+                [widget](const auto& it)
+                {
+                    return it.second.m_widget.get() == widget;
+                });
             element != m_viewportUiElements.end())
         {
             return element->second.m_viewportUiElementId;
@@ -246,7 +249,8 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     void ViewportUiDisplay::RemoveViewportUiElement(ViewportUiElementId elementId)
     {
-        AZ_Assert(elementId != AzToolsFramework::ViewportUi::InvalidViewportUiElementId,
+        AZ_Assert(
+            elementId != AzToolsFramework::ViewportUi::InvalidViewportUiElementId,
             "Tried to remove a Viewport UI element using an invalid or removed ViewportUiElementId.");
 
         auto viewportUiMapElement = m_viewportUiElements.find(elementId);
@@ -265,8 +269,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     void ViewportUiDisplay::ShowViewportUiElement(ViewportUiElementId elementId)
     {
-        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId);
-            element.m_widget)
+        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget)
         {
             element.m_widget->setVisible(true);
         }
@@ -274,8 +277,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     void ViewportUiDisplay::HideViewportUiElement(ViewportUiElementId elementId)
     {
-        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId);
-            element.m_widget)
+        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget)
         {
             element.m_widget->setVisible(false);
         }
@@ -283,8 +285,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     bool ViewportUiDisplay::IsViewportUiElementVisible(ViewportUiElementId elementId)
     {
-        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId);
-            element.m_widget)
+        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget)
         {
             return element.IsValid() && element.m_widget->isVisible();
         }
@@ -294,12 +295,12 @@ namespace AzToolsFramework::ViewportUi::Internal
     void ViewportUiDisplay::CreateComponentModeBorder(const AZStd::string& borderTitle)
     {
         AZStd::string styleSheet = AZStd::string::format(
-            "border: %dpx solid %s; border-top: %dpx solid %s;", HighlightBorderSize,
-            HighlightBorderColor, TopHighlightBorderSize, HighlightBorderColor);
+            "border: %dpx solid %s; border-top: %dpx solid %s;", HighlightBorderSize, HighlightBorderColor, TopHighlightBorderSize,
+            HighlightBorderColor);
         m_uiOverlay.setStyleSheet(styleSheet.c_str());
-        m_uiOverlayLayout.setContentsMargins(HighlightBorderSize + ViewportUiOverlayMargin,
-            TopHighlightBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin,
-            HighlightBorderSize + ViewportUiOverlayMargin);
+        m_uiOverlayLayout.setContentsMargins(
+            HighlightBorderSize + ViewportUiOverlayMargin, TopHighlightBorderSize + ViewportUiOverlayMargin,
+            HighlightBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin);
         m_componentModeBorderText.setVisible(true);
         m_componentModeBorderText.setText(borderTitle.c_str());
     }
@@ -315,8 +316,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         auto viewportUiMapElement = m_viewportUiElements.find(elementId);
 
-        if (viewportUiMapElement != m_viewportUiElements.end() &&
-            viewportUiMapElement->second.m_widget)
+        if (viewportUiMapElement != m_viewportUiElements.end() && viewportUiMapElement->second.m_widget)
         {
             viewportUiMapElement->second.m_anchored = false;
             viewportUiMapElement->second.m_worldPosition = pos;
@@ -329,48 +329,25 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         auto viewportUiMapElement = m_viewportUiElements.find(elementId);
 
-        if (viewportUiMapElement != m_viewportUiElements.end() &&
-            viewportUiMapElement->second.m_widget)
+        if (viewportUiMapElement != m_viewportUiElements.end() && viewportUiMapElement->second.m_widget)
         {
             viewportUiMapElement->second.m_anchored = true;
             SetUiOverlayContentsAnchored(viewportUiMapElement->second.m_widget.get(), alignment);
         }
     }
 
-    void ViewportUiDisplay::AddMaximumSizeViewportUiElement(QPointer<QWidget> widget)
-    {
-        if (widget)
-        {
-            return;
-        }
-
-        if (m_fullScreenWidget)
-        {
-            AZ_Warning(
-                "ViewportUi", false,
-                "Attaching a maximum size element when one already exists. Removing the previously attached element.");
-            RemoveViewportUiElement(GetViewportUiElementId(m_fullScreenWidget));
-        }
-
-        widget->setAttribute(Qt::WA_ShowWithoutActivating);
-        widget->setParent(&m_uiOverlay);
-        m_fullScreenWidget = widget;
-        m_fullScreenLayout.addWidget(m_fullScreenWidget, 0, 0, 1, 1);
-        m_renderOverlay->setFocus();
-    }
-
     // disables system background for widget and gives a transparent background
-    static void ConfigureWidgetForViewportUi(QPointer<QWidget> widget)
+    static void ConfigureWindowForViewportUi(QPointer<QMainWindow> mainWindow)
     {
-        // no background for the widget else each set of buttons/textfields/etc would have a black box around them
-        SetTransparentBackground(widget);
-        widget->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+        // no background for the widget else each set of buttons/text-fields/etc would have a black box around them
+        SetTransparentBackground(mainWindow);
+        mainWindow->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
     }
 
     void ViewportUiDisplay::InitializeUiOverlay()
     {
         m_uiMainWindow.setObjectName(m_uiMainWindow.windowTitle());
-        ConfigureWidgetForViewportUi(&m_uiMainWindow);
+        ConfigureWindowForViewportUi(&m_uiMainWindow);
         m_uiMainWindow.setVisible(false);
 
         m_uiOverlay.setObjectName(m_uiOverlay.windowTitle());
@@ -383,8 +360,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         m_fullScreenLayout.addLayout(&m_uiOverlayLayout, 0, 0, 1, 1);
 
         // format the label which will appear on top of the highlight border
-        AZStd::string styleSheet = AZStd::string::format(
-            "background-color: %s; border: none;", HighlightBorderColor);
+        AZStd::string styleSheet = AZStd::string::format("background-color: %s; border: none;", HighlightBorderColor);
         m_componentModeBorderText.setStyleSheet(styleSheet.c_str());
         m_componentModeBorderText.setFixedHeight(TopHighlightBorderSize);
         m_componentModeBorderText.setVisible(false);
@@ -394,6 +370,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     void ViewportUiDisplay::PrepareWidgetForViewportUi(QPointer<QWidget> widget)
     {
         widget->setAttribute(Qt::WA_ShowWithoutActivating);
+        // widget->setWindowFlags(Qt::WindowDoesNotAcceptFocus);
         widget->setParent(&m_uiOverlay);
         widget->setStyleSheet("border: none;");
     }
@@ -409,7 +386,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         m_renderOverlay->setFocus();
     }
 
-    void ViewportUiDisplay::SetUiOverlayContentsAnchored(QPointer<QWidget> widget, Qt::Alignment alignment)
+    void ViewportUiDisplay::SetUiOverlayContentsAnchored(QPointer<QWidget> widget, const Qt::Alignment alignment)
     {
         if (!widget)
         {
@@ -430,13 +407,8 @@ namespace AzToolsFramework::ViewportUi::Internal
             // get the border region by taking the entire region and subtracting the non-border area
             region += m_uiOverlay.rect();
             region -= QRect(
-                QPoint(
-                    m_uiOverlay.rect().left() + HighlightBorderSize,
-                    m_uiOverlay.rect().top() + TopHighlightBorderSize),
-                QPoint(
-                    m_uiOverlay.rect().right() - HighlightBorderSize,
-                    m_uiOverlay.rect().bottom() - HighlightBorderSize)
-            );
+                QPoint(m_uiOverlay.rect().left() + HighlightBorderSize, m_uiOverlay.rect().top() + TopHighlightBorderSize),
+                QPoint(m_uiOverlay.rect().right() - HighlightBorderSize, m_uiOverlay.rect().bottom() - HighlightBorderSize));
         }
 
         // add all children widget regions
@@ -466,8 +438,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     ViewportUiElementInfo ViewportUiDisplay::GetViewportUiElementInfo(const ViewportUiElementId elementId)
     {
-        if (auto element = m_viewportUiElements.find(elementId);
-            element != m_viewportUiElements.end())
+        if (auto element = m_viewportUiElements.find(elementId); element != m_viewportUiElements.end())
         {
             return element->second;
         }
@@ -489,7 +460,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         return &m_uiOverlayLayout;
     }
 
-    void SetTransparentBackground(QWidget * widget)
+    void SetTransparentBackground(QWidget* widget)
     {
         widget->setAttribute(Qt::WA_TranslucentBackground);
         widget->setAutoFillBackground(false);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
index 04000df131..aafaf61ff3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
@@ -11,11 +11,12 @@
 #include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/TextField.h>
-#include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
+
+#include <QLabel>
 #include <QMainWindow>
 #include <QPointer>
-#include <QLabel>
 
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
 #include <QGridLayout>
@@ -28,10 +29,10 @@ namespace AzToolsFramework::ViewportUi::Internal
     //! Used to track info for each widget in the Viewport UI.
     struct ViewportUiElementInfo
     {
-        AZStd::shared_ptr<QWidget> m_widget; //<! Reference to the widget.
-        ViewportUiElementId m_viewportUiElementId; //<! Corresponding ViewportUiElementId of the widget.
-        bool m_anchored = true; //<! Whether the widget is anchored to one position or moves with camera/entity.
-        AZ::Vector3 m_worldPosition; //<! If not anchored, use this to project widget position to screen space.
+        AZStd::shared_ptr<QWidget> m_widget; //!< Reference to the widget.
+        ViewportUiElementId m_viewportUiElementId; //!< Corresponding ViewportUiElementId of the widget.
+        bool m_anchored = true; //!< Whether the widget is anchored to one position or moves with camera/entity.
+        AZ::Vector3 m_worldPosition; //!< If not anchored, use this to project widget position to screen space.
 
         bool IsValid() const
         {
@@ -52,14 +53,14 @@ namespace AzToolsFramework::ViewportUi::Internal
         ViewportUiDisplay(QWidget* parent, QWidget* renderOverlay);
         ~ViewportUiDisplay();
 
-        void AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment align);
+        void AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment alignment);
         void AddClusterButton(ViewportUiElementId clusterId, Button* button);
         void SetClusterButtonLocked(ViewportUiElementId clusterId, ButtonId buttonId, bool isLocked);
         void SetClusterButtonTooltip(ViewportUiElementId clusterId, ButtonId buttonId, const AZStd::string& tooltip);
         void RemoveClusterButton(ViewportUiElementId clusterId, ButtonId buttonId);
         void UpdateCluster(const ViewportUiElementId clusterId);
 
-        void AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment align);
+        void AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment alignment);
         void AddSwitcherButton(ViewportUiElementId switcherId, Button* button);
         void RemoveSwitcherButton(ViewportUiElementId switcherId, ButtonId buttonId);
         void UpdateSwitcher(ViewportUiElementId switcherId);
@@ -90,13 +91,12 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         void CreateComponentModeBorder(const AZStd::string& borderTitle);
         void RemoveComponentModeBorder();
-        
+
     private:
         void PrepareWidgetForViewportUi(QPointer<QWidget> widget);
 
         ViewportUiElementId AddViewportUiElement(AZStd::shared_ptr<QWidget> widget);
         ViewportUiElementId GetViewportUiElementId(QPointer<QWidget> widget);
-        void AddMaximumSizeViewportUiElement(QPointer<QWidget> widget);
 
         void PositionViewportUiElementFromWorldSpace(ViewportUiElementId elementId, const AZ::Vector3& pos);
         void PositionViewportUiElementAnchored(ViewportUiElementId elementId, const Qt::Alignment alignment);
@@ -109,16 +109,16 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         ViewportUiElementInfo GetViewportUiElementInfo(const ViewportUiElementId elementId);
 
-        QMainWindow m_uiMainWindow; //<! The window which contains the UI Overlay.
-        QWidget m_uiOverlay; //<! The UI Overlay which displays Viewport UI Elements.
-        QGridLayout m_fullScreenLayout; //<! The layout which extends across the full screen.
-        ViewportUiDisplayLayout m_uiOverlayLayout; //<! The layout used for optionally anchoring Viewport UI Elements.
-        QLabel m_componentModeBorderText; //<! The text used for the Component Mode border.
+        QMainWindow m_uiMainWindow; //!< The window which contains the UI Overlay.
+        QWidget m_uiOverlay; //!< The UI Overlay which displays Viewport UI Elements.
+        QGridLayout m_fullScreenLayout; //!< The layout which extends across the full screen.
+        ViewportUiDisplayLayout m_uiOverlayLayout; //!< The layout used for optionally anchoring Viewport UI Elements.
+        QLabel m_componentModeBorderText; //!< The text used for the Component Mode border.
 
         QWidget* m_renderOverlay;
-        QPointer<QWidget> m_fullScreenWidget; //<! Reference to the widget attached to m_fullScreenLayout if any.
-        int m_viewportId;
-        int64_t m_numViewportElements = 0; 
+        QPointer<QWidget> m_fullScreenWidget; //!< Reference to the widget attached to m_fullScreenLayout if any.
+        int64_t m_numViewportElements = 0;
+        int m_viewportId = 0;
 
         ViewportUiElementIdInfoLookup m_viewportUiElements;
     };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
index 0b7e3341c7..c4ea8b0a20 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
@@ -29,7 +29,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         //! Must call ViewportUiWidgetCallbacks::Update to execute the callback.
         void RegisterUpdateCallback(QPointer<QObject> widget, const AZStd::function<void(QPointer<QObject>)>& callback);
         void Update();
-        const AZStd::vector<QPointer<QObject>> GetWidgets() const { return m_widgets; }
+        const AZStd::vector<QPointer<QObject>>& GetWidgets() const { return m_widgets; }
 
     protected:
         //! A map of all update callbacks and their respective widgets.

From cdedb62634ea5da48b5e32c3c92d7071f5e5a66a Mon Sep 17 00:00:00 2001
From: hultonha <hultonha@amazon.co.uk>
Date: Tue, 20 Jul 2021 18:18:56 +0100
Subject: [PATCH 2/3] remove commented line

Signed-off-by: hultonha <hultonha@amazon.co.uk>
---
 .../AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index b2e836a649..b82fddcf34 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -370,7 +370,6 @@ namespace AzToolsFramework::ViewportUi::Internal
     void ViewportUiDisplay::PrepareWidgetForViewportUi(QPointer<QWidget> widget)
     {
         widget->setAttribute(Qt::WA_ShowWithoutActivating);
-        // widget->setWindowFlags(Qt::WindowDoesNotAcceptFocus);
         widget->setParent(&m_uiOverlay);
         widget->setStyleSheet("border: none;");
     }

From 0b4e8b468fc67806e0c0b2a0722929ea8fdb5bca Mon Sep 17 00:00:00 2001
From: hultonha <hultonha@amazon.co.uk>
Date: Wed, 21 Jul 2021 14:13:34 +0100
Subject: [PATCH 3/3] further formatting changes for viewport ui

Signed-off-by: hultonha <hultonha@amazon.co.uk>
---
 .../AzToolsFramework/ViewportUi/Button.cpp    |  1 -
 .../AzToolsFramework/ViewportUi/Button.h      |  4 ++--
 .../AzToolsFramework/ViewportUi/ButtonGroup.h |  4 ++--
 .../AzToolsFramework/ViewportUi/TextField.cpp |  4 +---
 .../AzToolsFramework/ViewportUi/TextField.h   |  7 +++---
 .../ViewportUi/ViewportUiCluster.cpp          |  1 -
 .../ViewportUi/ViewportUiDisplay.cpp          |  1 -
 .../ViewportUi/ViewportUiDisplayLayout.cpp    | 17 +++++++------
 .../ViewportUi/ViewportUiDisplayLayout.h      |  6 ++---
 .../ViewportUi/ViewportUiManager.cpp          | 24 +++++++------------
 .../ViewportUi/ViewportUiManager.h            |  2 +-
 .../ViewportUi/ViewportUiSwitcher.cpp         | 23 +++++++++++++-----
 .../ViewportUi/ViewportUiSwitcher.h           |  4 ++--
 .../ViewportUi/ViewportUiTextField.cpp        | 20 ++++++++++------
 .../ViewportUi/ViewportUiTextField.h          | 16 ++++++-------
 .../ViewportUi/ViewportUiWidgetCallbacks.cpp  |  9 +++----
 .../ViewportUi/ViewportUiWidgetCallbacks.h    | 16 +++++++++----
 17 files changed, 86 insertions(+), 73 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
index 0d03271b93..3798bc1d22 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include <AzToolsFramework/ViewportUi/Button.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
index 2bd35ba75d..b18f4723d8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
@@ -28,7 +28,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         AZStd::string m_icon; //!< The icon for this button, string path to an image.
         AZStd::string m_name; //!< The name displayed as a label next to the button's icon.
-        State m_state = State::Deselected; 
-        ButtonId m_buttonId; 
+        State m_state = State::Deselected;
+        ButtonId m_buttonId;
     };
 } // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
index 080ccb447e..0500a80c36 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
@@ -1,5 +1,3 @@
-#pragma once
-
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -8,6 +6,8 @@
  *
  */
 
+#pragma once
+
 #include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
index 44f856fe76..beb0db3147 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
@@ -10,9 +10,7 @@
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
-    TextField::TextField(
-        const AZStd::string& labelText, const AZStd::string& fieldText,
-        TextFieldValidationType validationType)
+    TextField::TextField(const AZStd::string& labelText, const AZStd::string& fieldText, TextFieldValidationType validationType)
         : m_labelText(labelText)
         , m_fieldText(fieldText)
         , m_validationType(validationType)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
index 9cecf14fb8..682e4881b4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
@@ -19,16 +19,17 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
     public:
         TextField(
-            const AZStd::string& labelText = "", const AZStd::string& fieldText = "",
+            const AZStd::string& labelText = "",
+            const AZStd::string& fieldText = "",
             TextFieldValidationType validationType = TextFieldValidationType::String);
         ~TextField() = default;
 
         void ConnectEventHandler(AZ::Event<AZStd::string>::Handler& handler);
 
         //! Default text for the text field. Will be cast to same type as m_validationType.
-        AZStd::string m_fieldText; 
+        AZStd::string m_fieldText;
         AZStd::string m_labelText;
-        TextFieldValidationType m_validationType; //<! The type of validator for this text edit.
+        TextFieldValidationType m_validationType; //!< The type of validator for this text edit.
         TextFieldId m_textFieldId;
         ViewportUiElementId m_viewportId;
         AZ::Event<AZStd::string> m_textEditedEvent;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
index f8d92cdda4..bc299f9985 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index 8710c94c4d..3b2c26114d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzFramework/Viewport/ViewportScreen.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
index a6a472a181..f25d03a7be 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
@@ -6,15 +6,19 @@
  *
  */
 
-
 #include <AzCore/Console/IConsole.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h>
-#include <QtWidgets/QWidget>
+
+#include <QWidget>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
     AZ_CVAR(
-        int, ViewportUiDisplayLayoutSpacing, 5, nullptr, AZ::ConsoleFunctorFlags::Null,
+        int,
+        ViewportUiDisplayLayoutSpacing,
+        5,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The spacing between elements attached to the Viewport UI Display Layout");
 
     ViewportUiDisplayLayout::ViewportUiDisplayLayout(QWidget* parent)
@@ -27,7 +31,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         setSpacing(ViewportUiDisplayLayoutSpacing);
 
         // create a 3x2 map of sub layouts which will stack widgets according to their mapped alignment
-        m_internalLayouts = AZStd::unordered_map<Qt::Alignment, QBoxLayout*> {
+        m_internalLayouts = AZStd::unordered_map<Qt::Alignment, QBoxLayout*>{
             CreateSubLayout(new QVBoxLayout(), 0, 0, Qt::AlignTop | Qt::AlignLeft),
             CreateSubLayout(new QVBoxLayout(), 1, 0, Qt::AlignBottom | Qt::AlignLeft),
             CreateSubLayout(new QVBoxLayout(), 0, 1, Qt::AlignTop),
@@ -45,8 +49,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
 
         // find the corresponding sub layout for the alignment and add the widget
-        if (auto layoutForAlignment = m_internalLayouts.find(alignment);
-            layoutForAlignment != m_internalLayouts.end())
+        if (auto layoutForAlignment = m_internalLayouts.find(alignment); layoutForAlignment != m_internalLayouts.end())
         {
             // place the widget before or after the invisible spacer
             // depending on the layout alignment
@@ -97,7 +100,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         // without this, alignment and resizing within the sublayouts becomes difficult
         layout->addStretch(1);
 
-        addLayout(layout, row, column, /*rowSpan=*/ 1, /*colSpan=*/ 1, alignment);
+        addLayout(layout, row, column, /*rowSpan=*/1, /*colSpan=*/1, alignment);
 
         return { alignment, layout };
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
index 67fac85ec5..4a44f07491 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
@@ -9,8 +9,9 @@
 #pragma once
 
 #include <AzCore/std/containers/unordered_map.h>
-#include <QGridLayout>
+
 #include <QBoxLayout>
+#include <QGridLayout>
 #include <QPointer>
 
 namespace AzToolsFramework::ViewportUi::Internal
@@ -33,8 +34,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     private:
         //! Create a sub-layout to add to the grid of layouts.
         //! @return A pair of the new layout along with its alignment on the grid.
-        AZStd::pair<Qt::Alignment, QBoxLayout*> CreateSubLayout(
-            QBoxLayout* layout, int row, int column, Qt::Alignment alignment);
+        AZStd::pair<Qt::Alignment, QBoxLayout*> CreateSubLayout(QBoxLayout* layout, int row, int column, Qt::Alignment alignment);
 
         //! A mapping of each sub-layout to its corresponding alignment on the grid.
         AZStd::unordered_map<Qt::Alignment, QBoxLayout*> m_internalLayouts;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
index 0ef00e006f..cee4a311e8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
@@ -6,12 +6,11 @@
  *
  */
 
-
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ButtonGroup.h>
-#include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 
 namespace AzToolsFramework::ViewportUi
 {
@@ -114,7 +113,8 @@ namespace AzToolsFramework::ViewportUi
         return ButtonId(0);
     }
 
-    const ButtonId ViewportUiManager::CreateSwitcherButton(const SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name)
+    const ButtonId ViewportUiManager::CreateSwitcherButton(
+        const SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name)
     {
         if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
         {
@@ -146,8 +146,7 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-    static void SetViewportUiElementVisible(
-        Internal::ViewportUiDisplay* ui, ViewportUiElementId id, bool visible)
+    static void SetViewportUiElementVisible(Internal::ViewportUiDisplay* ui, ViewportUiElementId id, bool visible)
     {
         if (visible)
         {
@@ -186,11 +185,9 @@ namespace AzToolsFramework::ViewportUi
     }
 
     const TextFieldId ViewportUiManager::CreateTextField(
-        const AZStd::string& labelText, const AZStd::string& textFieldDefaultText,
-        TextFieldValidationType validationType) 
+        const AZStd::string& labelText, const AZStd::string& textFieldDefaultText, TextFieldValidationType validationType)
     {
-        auto textField = AZStd::make_shared<Internal::TextField>(
-            labelText, textFieldDefaultText, validationType);
+        auto textField = AZStd::make_shared<Internal::TextField>(labelText, textFieldDefaultText, validationType);
         m_viewportUi->AddTextField(textField);
 
         return RegisterNewTextField(textField);
@@ -206,8 +203,7 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-    void ViewportUiManager::RegisterTextFieldCallback(
-        TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) 
+    void ViewportUiManager::RegisterTextFieldCallback(TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler)
     {
         if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
@@ -234,7 +230,6 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-
     void ViewportUiManager::CreateComponentModeBorder(const AZStd::string& borderTitle)
     {
         m_viewportUi->CreateComponentModeBorder(borderTitle);
@@ -248,8 +243,7 @@ namespace AzToolsFramework::ViewportUi
     void ViewportUiManager::PressButton(ClusterId clusterId, ButtonId buttonId)
     {
         // Find cluster using ID and cluster map
-        if (auto clusterIt = m_clusterButtonGroups.find(clusterId);
-            clusterIt != m_clusterButtonGroups.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
             clusterIt->second->PressButton(buttonId);
         }
@@ -305,7 +299,7 @@ namespace AzToolsFramework::ViewportUi
     SwitcherId ViewportUiManager::RegisterNewSwitcher(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup)
     {
         SwitcherId newId = SwitcherId(m_switcherButtonGroups.size() + 1);
-        m_switcherButtonGroups.insert({newId, buttonGroup});
+        m_switcherButtonGroups.insert({ newId, buttonGroup });
 
         return newId;
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
index 6ab4bd9e5c..137ee7b2c0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
@@ -18,7 +18,7 @@ namespace AzToolsFramework::ViewportUi
     {
         class ButtonGroup;
         class ViewportUiDisplay;
-    }
+    } // namespace Internal
 
     class ViewportUiManager : public ViewportUiRequestBus::Handler
     {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
index 80f064c04a..6b8b1873f7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
@@ -65,8 +65,12 @@ namespace AzToolsFramework::ViewportUi::Internal
         // resize to fit new action with minimum extra space
         resize(minimumSizeHint());
 
-        const AZStd::function<void()>& callback = [this, button]() { m_buttonGroup->PressButton(button->m_buttonId); };
-        const AZStd::function<void(QAction*)>& updateCallback = [button](QAction* action) {
+        const AZStd::function<void()>& callback = [this, button]()
+        {
+            m_buttonGroup->PressButton(button->m_buttonId);
+        };
+        const AZStd::function<void(QAction*)>& updateCallback = [button](QAction* action)
+        {
             action->setChecked(button->m_state == Button::State::Selected);
         };
 
@@ -78,9 +82,13 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         // register the action
         m_widgetCallbacks.AddWidget(
-            action, [updateCallback](QPointer<QObject> object) { updateCallback(static_cast<QAction*>(object.data())); });
+            action,
+            [updateCallback](QPointer<QObject> object)
+            {
+                updateCallback(static_cast<QAction*>(object.data()));
+            });
 
-        m_buttonActionMap.insert({button->m_buttonId, action});
+        m_buttonActionMap.insert({ button->m_buttonId, action });
     }
 
     void ViewportUiSwitcher::RemoveButton(ButtonId buttonId)
@@ -121,9 +129,12 @@ namespace AzToolsFramework::ViewportUi::Internal
         // Check if it is the first active mode to be set
         bool initialActiveMode = (m_activeButtonId == ButtonId(0));
 
-        // Change the toolbutton's name and icon to that button
+        // Change the tool button's name and icon to that button
         const AZStd::vector<Button*> buttons = m_buttonGroup->GetButtons();
-        auto found = [buttonId](Button* button) { return (button->m_buttonId == buttonId); };
+        auto found = [buttonId](Button* button)
+        {
+            return (button->m_buttonId == buttonId);
+        };
 
         if (auto buttonIt = AZStd::find_if(buttons.begin(), buttons.end(), found); buttonIt != buttons.end())
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
index 9af8774b6d..6620cb6aca 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
-#include <functional>
+
 #include <QPointer>
 #include <QToolBar>
 #include <QToolButton>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
index d216749f99..d94c8d6dca 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include "ViewportUiTextField.h"
 
 #include <AzCore/Console/IConsole.h>
@@ -16,7 +15,11 @@
 namespace AzToolsFramework::ViewportUi::Internal
 {
     AZ_CVAR(
-        int, ViewportUiTextFieldLength, 35, nullptr, AZ::ConsoleFunctorFlags::Null,
+        int,
+        ViewportUiTextFieldLength,
+        35,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The pixel length of the text field part of a ViewportUiTextField");
 
     ViewportUiTextField::ViewportUiTextField(AZStd::shared_ptr<TextField> textField)
@@ -56,11 +59,14 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         m_lineEdit.setValidator(m_validator);
 
-        connect(&m_lineEdit, &QLineEdit::textEdited, &m_lineEdit, [textField](QString text) {
-            // convert the text using toLocal8Bit().data() as recommended by Qt, then emit signal
-            textField->m_fieldText = text.toLocal8Bit().data();
-            textField->m_textEditedEvent.Signal(textField->m_fieldText);
-        });
+        connect(
+            &m_lineEdit, &QLineEdit::textEdited, &m_lineEdit,
+            [textField](QString text)
+            {
+                // convert the text using toLocal8Bit().data() as recommended by Qt, then emit signal
+                textField->m_fieldText = text.toLocal8Bit().data();
+                textField->m_textEditedEvent.Signal(textField->m_fieldText);
+            });
     }
 
     void ViewportUiTextField::Update()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
index ad56e78671..0e7a9043eb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
@@ -7,7 +7,10 @@
  */
 
 #pragma once
+
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzToolsFramework/ViewportUi/TextField.h>
+
 #include <QLabel>
 #include <QLineEdit>
 #include <QWidget>
@@ -17,13 +20,10 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
 #include <QVBoxLayout>
 AZ_POP_DISABLE_WARNING
 
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-
 namespace AzToolsFramework::ViewportUi::Internal
 {
     //! Helper class for a widget that holds and manages multiple LabelTextFields.
-    class ViewportUiTextField
-        : public QWidget
+    class ViewportUiTextField : public QWidget
     {
         Q_OBJECT
 
@@ -34,9 +34,9 @@ namespace AzToolsFramework::ViewportUi::Internal
         void Update();
 
     private:
-        QLabel m_label; //<! The text label.
-        QLineEdit m_lineEdit; //<! The editable text field.
-        QValidator* m_validator; //<! The validator for the line edit text.
-        AZStd::shared_ptr<TextField> m_textField; //<! Reference to the text field data struct.
+        QLabel m_label; //!< The text label.
+        QLineEdit m_lineEdit; //!< The editable text field.
+        QValidator* m_validator; //!< The validator for the line edit text.
+        AZStd::shared_ptr<TextField> m_textField; //!< Reference to the text field data struct.
     };
 } // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
index d86a4b7f06..1451912c82 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
@@ -6,13 +6,11 @@
  *
  */
 
-
 #include "ViewportUiWidgetCallbacks.h"
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
-    void ViewportUiWidgetCallbacks::AddWidget(
-        QPointer<QObject> widget, const AZStd::function<void(QPointer<QObject>)>& updateCallback)
+    void ViewportUiWidgetCallbacks::AddWidget(QPointer<QObject> widget, const AZStd::function<void(QPointer<QObject>)>& updateCallback)
     {
         if (widget.isNull())
         {
@@ -40,7 +38,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         // if widget exists on the manager, register the callback
         auto callBackWidget = AZStd::find(m_widgets.begin(), m_widgets.end(), widget);
-        AZ_Assert(callBackWidget != m_widgets.end(), "Unable to register a callback for an unregistered widget.")
+        AZ_Assert(callBackWidget != m_widgets.end(), "Unable to register a callback for an unregistered widget.");
 
         if (callBackWidget != m_widgets.end())
         {
@@ -58,8 +56,7 @@ namespace AzToolsFramework::ViewportUi::Internal
                 RemoveWidget(widget);
             }
             // check if the widget has not been deleted externally
-            else if (auto callback = m_updateCallbacks.find(widget);
-                callback != m_updateCallbacks.end())
+            else if (auto callback = m_updateCallbacks.find(widget); callback != m_updateCallbacks.end())
             {
                 callback->second(widget);
             }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
index 5cf415f132..582f90349f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
@@ -9,12 +9,12 @@
 #pragma once
 
 #include <AzCore/Memory/Memory.h>
-#include <AzCore/std/function/function_template.h>
 #include <AzCore/std/containers/unordered_map.h>
-#include <QPointer>
-#include <QObject>
-#include <QMetaMethod>
+#include <AzCore/std/function/function_template.h>
 
+#include <QMetaMethod>
+#include <QObject>
+#include <QPointer>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
@@ -30,7 +30,8 @@ namespace AzToolsFramework::ViewportUi::Internal
         //! Must call ViewportUiWidgetCallbacks::Update to execute the callback.
         void RegisterUpdateCallback(QPointer<QObject> widget, const AZStd::function<void(QPointer<QObject>)>& callback);
         void Update();
-        const AZStd::vector<QPointer<QObject>>& GetWidgets() const { return m_widgets; }
+
+        const AZStd::vector<QPointer<QObject>>& GetWidgets() const;
 
     protected:
         //! A map of all update callbacks and their respective widgets.
@@ -38,4 +39,9 @@ namespace AzToolsFramework::ViewportUi::Internal
         AZStd::unordered_map<QObject*, AZStd::function<void(QPointer<QObject>)>> m_updateCallbacks;
         AZStd::vector<QPointer<QObject>> m_widgets;
     };
+
+    inline const AZStd::vector<QPointer<QObject>>& ViewportUiWidgetCallbacks::GetWidgets() const
+    {
+        return m_widgets;
+    }
 } // namespace AzToolsFramework::ViewportUi::Internal