From 03372d2ea91e77113bc1b08a1972070a4122fb69 Mon Sep 17 00:00:00 2001
From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
Date: Thu, 23 Sep 2021 12:50:49 -0700
Subject: [PATCH] Made IsInFocusSubTree const, and other minor refactorings.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
---
 .../AzToolsFramework/FocusMode/FocusModeInterface.h            | 2 +-
 .../AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp    | 2 +-
 .../AzToolsFramework/FocusMode/FocusModeSystemComponent.h      | 2 +-
 .../AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp   | 3 +--
 .../AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp    | 2 +-
 .../AzToolsFramework/ViewportSelection/EditorHelpers.h         | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeInterface.h
index 6d3a7599de..a4b90f95b7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeInterface.h
@@ -33,7 +33,7 @@ namespace AzToolsFramework
         virtual AZ::EntityId GetFocusRoot() = 0;
 
         //! Returns whether the entity id provided is part of the focused sub-tree.
-        virtual bool IsInFocusSubTree(AZ::EntityId entityId) = 0;
+        virtual bool IsInFocusSubTree(AZ::EntityId entityId) const = 0;
     };
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp
index e08191032d..e1c04fcb93 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp
@@ -79,7 +79,7 @@ namespace AzToolsFramework
         return m_focusRoot;
     }
 
-    bool FocusModeSystemComponent::IsInFocusSubTree(AZ::EntityId entityId)
+    bool FocusModeSystemComponent::IsInFocusSubTree(AZ::EntityId entityId) const
     {
         if (m_focusRoot == AZ::EntityId())
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.h
index 697a4ff998..27ddebe1ed 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.h
@@ -42,7 +42,7 @@ namespace AzToolsFramework
         void SetFocusRoot(AZ::EntityId entityId) override;
         void ClearFocusRoot() override;
         AZ::EntityId GetFocusRoot() override;
-        bool IsInFocusSubTree(AZ::EntityId entityId) override;
+        bool IsInFocusSubTree(AZ::EntityId entityId) const override;
 
     private:
         AZ::EntityId m_focusRoot;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
index d6d5c75304..90f8e1d121 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
@@ -537,8 +537,7 @@ namespace AzToolsFramework
             break;
         }
 
-        AZ::EntityId entityId = GetEntityFromIndex(index);
-        if (!m_focusModeInterface->IsInFocusSubTree(entityId))
+        if (AZ::EntityId entityId = GetEntityFromIndex(index); !m_focusModeInterface->IsInFocusSubTree(entityId))
         {
             itemFlags &= !Qt::ItemIsEnabled;
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
index e32a719a15..2d20ac7364 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
@@ -61,7 +61,7 @@ namespace AzToolsFramework
         }
     }
 
-    void EntityOutlinerTreeView::leaveEvent(QEvent* /*event*/)
+    void EntityOutlinerTreeView::leaveEvent([[maybe_unused]] QEvent* event)
     {
         m_mousePosition = QPoint();
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
index 87865202e0..a6a78a4e61 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
@@ -60,6 +60,6 @@ namespace AzToolsFramework
 
     private:
         const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; //!< Entity Data queried by the EditorHelpers.
-        FocusModeInterface* m_focusModeInterface = nullptr;
+        const FocusModeInterface* m_focusModeInterface = nullptr;
     };
 } // namespace AzToolsFramework