From 9e0dccbf39090e4536dfa407d1cdd6162deffbd6 Mon Sep 17 00:00:00 2001
From: hasareej <hasareej@amazon.com>
Date: Mon, 14 Jun 2021 16:22:36 +0100
Subject: [PATCH] Initial bug fix - Added a margin.

---
 .../AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp          | 3 ---
 .../AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp    | 3 ++-
 .../AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h      | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index 3565d33174..37776f97e1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -24,8 +24,6 @@
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
-    // margin for the Viewport UI Overlay in pixels
-    const static int ViewportUiOverlayMargin = 5;
     const static int HighlightBorderSize = 5;
     const static int TopHighlightBorderSize = 25;
     const static char* HighlightBorderColor = "#44B2F8";
@@ -379,7 +377,6 @@ namespace AzToolsFramework::ViewportUi::Internal
         m_fullScreenLayout.setSpacing(0);
         m_fullScreenLayout.setContentsMargins(0, 0, 0, 0);
         m_fullScreenLayout.addLayout(&m_uiOverlayLayout, 0, 0, 1, 1);
-        m_uiOverlayLayout.setMargin(ViewportUiOverlayMargin);
 
         // format the label which will appear on top of the highlight border
         AZStd::string styleSheet = AZStd::string::format(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
index bab664d832..a03248d8df 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
@@ -25,7 +25,8 @@ namespace AzToolsFramework::ViewportUi::Internal
         : QGridLayout(parent)
     {
         // set margins and spacing for internal contents
-        setContentsMargins(0, 0, 0, 0);
+        // +20 to avoid overlapping with ImGui
+        setContentsMargins(ViewportUiOverlayMargin, ViewportUiOverlayMargin + 20, ViewportUiOverlayMargin, ViewportUiOverlayMargin);
         setSpacing(ViewportUiDisplayLayoutSpacing);
 
         // create a 3x2 map of sub layouts which will stack widgets according to their mapped alignment
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
index 0beb0d5bd6..f4699ef492 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
@@ -19,6 +19,9 @@
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
+    // margin for the Viewport UI Overlay in pixels
+    const static int ViewportUiOverlayMargin = 5;
+
     //! QGridLayout implementation that uses a grid of QVBox/QHBoxLayouts internally to stack widgets.
     class ViewportUiDisplayLayout : public QGridLayout
     {