Merge branch 'main' into Prefab/CreatePrefab

2021-04-22 14:54:01 -07:00
parent 17dbe55189 f44f06c9f0
commit 3b3b4305c1
710 changed files with 29481 additions and 30600 deletions
@@ -815,8 +815,6 @@ namespace AzToolsFramework
        /// Hide or show the circular dependency error when saving slices
        virtual void SetShowCircularDependencyError(const bool& /*showCircularDependencyError*/) {}

-        virtual void SetEditTool(const char* /*tool*/) {}
-
        /// Launches the Lua editor and opens the specified (space separated) files.
        virtual void LaunchLuaEditor(const char* /*files*/) {}

@@ -170,6 +170,15 @@ namespace AzToolsFramework
            return m_filter;
        }

+        QSharedPointer<CompositeFilter> SearchWidget::GetStringFilter() const
+        {
+            return m_stringFilter;
+        }
+
+        QSharedPointer<CompositeFilter> SearchWidget::GetTypesFilter() const
+        {
+            return m_typesFilter;
+        }
    } // namespace AssetBrowser
 } // namespace AzToolsFramework

@@ -39,6 +39,10 @@ namespace AzToolsFramework

            QSharedPointer<CompositeFilter> GetFilter() const;

+            QSharedPointer<CompositeFilter> GetStringFilter() const;
+
+            QSharedPointer<CompositeFilter> GetTypesFilter() const;
+
            QString GetFilterString() const { return textFilter(); }
            void ClearStringFilter() { ClearTextFilter(); }

@@ -140,7 +140,7 @@ namespace AzToolsFramework
            else
            {
                QPixmap pixmap = thumbnail->GetPixmap(size);
-                painter->drawPixmap(point.x(), point.y(), size.width(), size.height(), pixmap);
+                painter->drawPixmap(point, pixmap.scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
            }
            return m_iconSize;
        }
@@ -491,6 +491,14 @@ namespace AzToolsFramework

        EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::OnStartPlayInEditorBegin);

+        //cache the current selected entities.
+        ToolsApplicationRequests::Bus::BroadcastResult(m_selectedBeforeStartingGame, &ToolsApplicationRequests::GetSelectedEntities);
+        //deselect entities if selected when entering game mode before deactivating the entities in StartPlayInEditor(...)
+        if (!m_selectedBeforeStartingGame.empty())
+        {
+            ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::MarkEntitiesDeselected, m_selectedBeforeStartingGame);
+        }
+
        if (m_isLegacySliceService)
        {
            SliceEditorEntityOwnershipService* editorEntityOwnershipService =
@@ -507,8 +515,6 @@ namespace AzToolsFramework

        m_isRunningGame = true;

-        ToolsApplicationRequests::Bus::BroadcastResult(m_selectedBeforeStartingGame, &ToolsApplicationRequests::GetSelectedEntities);
-
        EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::OnStartPlayInEditor);
    }

@@ -94,6 +94,7 @@ namespace AzToolsFramework
            m_prefabSystemComponent->RemoveTemplate(templateId);
        }
        m_rootInstance->Reset();
+        m_rootInstance->SetContainerEntityName("Level");

        AzFramework::EntityOwnershipServiceNotificationBus::Event(
            m_entityContextId, &AzFramework::EntityOwnershipServiceNotificationBus::Events::OnEntityOwnershipServiceReset);
@@ -198,6 +199,7 @@ namespace AzToolsFramework

        m_rootInstance->SetTemplateId(templateId);
        m_rootInstance->SetTemplateSourcePath(m_loaderInterface->GetRelativePathToProject(filename));
+        m_rootInstance->SetContainerEntityName("Level");
        m_prefabSystemComponent->PropagateTemplateChanges(templateId);

        return true;
@@ -123,7 +123,11 @@ namespace AzToolsFramework
        void Instance::SetTemplateSourcePath(AZ::IO::PathView sourcePath)
        {
            m_templateSourcePath = sourcePath;
-            m_containerEntity->SetName(sourcePath.Filename().Native());
+        }
+
+        void Instance::SetContainerEntityName(AZStd::string_view containerName)
+        {
+            m_containerEntity->SetName(containerName);
        }

        bool Instance::AddEntity(AZ::Entity& entity)
@@ -570,7 +574,7 @@ namespace AzToolsFramework

        AZ::EntityId Instance::GetContainerEntityId() const
        {
-            return m_containerEntity->GetId();
+            return m_containerEntity ? m_containerEntity->GetId() : AZ::EntityId();
        }

        bool Instance::HasContainerEntity() const
@@ -80,6 +80,7 @@ namespace AzToolsFramework

            const AZ::IO::Path& GetTemplateSourcePath() const;
            void SetTemplateSourcePath(AZ::IO::PathView sourcePath);
+            void SetContainerEntityName(AZStd::string_view containerName);

            bool AddEntity(AZ::Entity& entity);
            bool AddEntity(AZ::Entity& entity, EntityAlias entityAlias);
@@ -709,7 +709,7 @@ namespace AzToolsFramework
                InstanceOptionalReference owningInstance = m_instanceEntityMapperInterface->FindOwningInstance(entity->GetId());
                AZ_Assert(
                    owningInstance.has_value(),
-                    "An error occored while retrieving entities and prefab instances : "
+                    "An error occurred while retrieving entities and prefab instances : "
                    "Owning instance of entity with id '%llu' couldn't be found",
                    entity->GetId());

@@ -793,7 +793,7 @@ namespace AzToolsFramework
                {
                    AZ_Assert(
                        false,
-                        "An error occored in function EntitiesBelongToSameInstance: "
+                        "An error occurred in function EntitiesBelongToSameInstance: "
                        "Owning instance of entity with id '%llu' couldn't be found",
                        entityId);
                    return false;
@@ -122,6 +122,7 @@ namespace AzToolsFramework
            }

            newInstance->SetTemplateSourcePath(relativeFilePath);
+            newInstance->SetContainerEntityName(relativeFilePath.Stem().Native());

            TemplateId newTemplateId = CreateTemplateFromInstance(*newInstance, shouldCreateLinks);
            if (newTemplateId == InvalidTemplateId)
@@ -10,12 +10,14 @@
 *
 */

+#include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
 #include <AzToolsFramework/Thumbnails/Thumbnail.h>
 AZ_PUSH_DISABLE_WARNING(4127 4251 4800 4244, "-Wunknown-warning-option") // 4127: conditional expression is constant
                                                                         // 4251: 'QTextCodec::ConverterState::flags': class 'QFlags<QTextCodec::ConversionFlag>' needs to have dll-interface to be used by clients of struct 'QTextCodec::ConverterState'
                                                                         // 4800: 'QTextBoundaryFinderPrivate *const ': forcing value to bool 'true' or 'false' (performance warning)
                                                                         // 4244: conversion from 'int' to 'qint8', possible loss of data
 #include <QtConcurrent/QtConcurrent>
+#include <QThreadPool>
 AZ_POP_DISABLE_WARNING

 namespace AzToolsFramework
@@ -80,7 +82,11 @@ namespace AzToolsFramework
            if (m_state == State::Unloaded)
            {
                m_state = State::Loading;
-                QFuture<void> future = QtConcurrent::run([this](){ LoadThread(); });
+                QThreadPool* threadPool;
+                ThumbnailContextRequestBus::BroadcastResult(
+                    threadPool,
+                    &ThumbnailContextRequestBus::Handler::GetThreadPool);
+                QFuture<void> future = QtConcurrent::run(threadPool, [this](){ LoadThread(); });
                m_watcher.setFuture(future);
            }
        }
@@ -28,10 +28,15 @@ namespace AzToolsFramework
            : m_missingThumbnail(new MissingThumbnail(thumbnailSize))
            , m_loadingThumbnail(new LoadingThumbnail(thumbnailSize))
            , m_thumbnailSize(thumbnailSize)
+            , m_threadPool(this)
        {
+            ThumbnailContextRequestBus::Handler::BusConnect();
        }

-        ThumbnailContext::~ThumbnailContext() = default;
+        ThumbnailContext::~ThumbnailContext()
+        {
+            ThumbnailContextRequestBus::Handler::BusDisconnect();
+        }

        bool ThumbnailContext::IsLoading(SharedThumbnailKey key)
        {
@@ -53,6 +58,11 @@ namespace AzToolsFramework
            AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(&AzToolsFramework::AssetBrowser::AssetBrowserViewRequests::Update);
        }

+        QThreadPool* ThumbnailContext::GetThreadPool()
+        {
+            return &m_threadPool;
+        }
+
        SharedThumbnail ThumbnailContext::GetThumbnail(SharedThumbnailKey key)
        {
            SharedThumbnail thumbnail;
@@ -19,6 +19,7 @@

 #include <QObject>
 #include <QList>
+#include <QThreadPool>
 #endif

 class QString;
@@ -40,6 +41,7 @@ namespace AzToolsFramework
        */
        class ThumbnailContext
            : public QObject
+            , public ThumbnailContextRequestBus::Handler
        {
            Q_OBJECT
        public:
@@ -58,10 +60,13 @@ namespace AzToolsFramework
            void UnregisterThumbnailProvider(const char* providerName);

            void RedrawThumbnail();
-            
+
            //! Default context used for most thumbnails
            static constexpr const char* DefaultContext = "Default";

+            // ThumbnailContextRequestBus::Handler interface overrides...
+            QThreadPool* GetThreadPool() override;
+
        private:
            struct ProviderCompare {
                bool operator() (const SharedThumbnailProvider& lhs, const SharedThumbnailProvider& rhs) const
@@ -79,6 +84,9 @@ namespace AzToolsFramework
            SharedThumbnail m_loadingThumbnail;
            //! Thumbnail size (width and height in pixels)
            int m_thumbnailSize;
+            //! There is only a limited number of threads on global threadPool, because there can be many thumbnails rendering at once
+            //! an individual threadPool is needed to avoid deadlocks
+            QThreadPool m_threadPool;
        };
    } // namespace Thumbnailer
 } // namespace AzToolsFramework
@@ -79,7 +79,12 @@ namespace AzToolsFramework
                int realHeight = qMin(aznumeric_cast<int>(originalWidth /aspectRatio), originalHeight);
                int realWidth = aznumeric_cast<int>(realHeight * aspectRatio);
                int x = (originalWidth - realWidth) / 2;
-                painter.drawPixmap(QRect(x, 0, realHeight, realWidth), pixmap);
+                // pixmap needs to be manually scaled to produce smoother result and avoid looking pixelated
+                // using painter.setRenderHint(QPainter::SmoothPixmapTransform); does not seem to work
+                // Note: there is a potential issue with pixmap.scaled:
+                // it is multithreaded (using global threadPool) and blocking until finished.
+                // A deadlock will happen if global threadPool has no free threads available.
+                painter.drawPixmap(QPoint(x, 0), pixmap.scaled(realWidth, realHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
            }
            QWidget::paintEvent(event);
        }
@@ -17,11 +17,23 @@
 #include <AzToolsFramework/Thumbnails/Thumbnail.h>

 class QPixmap;
+class QThreadPool;

 namespace AzToolsFramework
 {
    namespace Thumbnailer
    {
+        //! Interaction with thumbnail context
+        class ThumbnailContextRequests
+            : public AZ::EBusTraits
+        {
+        public:
+            //! Get thread pool for drawing thumbnails
+            virtual QThreadPool* GetThreadPool() = 0;
+        };
+
+        using ThumbnailContextRequestBus = AZ::EBus<ThumbnailContextRequests>;
+
        //! Interaction with thumbnailer
        class ThumbnailerRequests
            : public AZ::EBusTraits
@@ -61,6 +61,11 @@ namespace AzToolsFramework
        return true;
    }

+    bool EditorEntityUiHandlerBase::CanRename(AZ::EntityId /*entityId*/) const
+    {
+        return true;
+    }
+
    void EditorEntityUiHandlerBase::PaintItemBackground(QPainter* /*painter*/, const QStyleOptionViewItem& /*option*/, const QModelIndex& /*index*/) const
    {
    }
@@ -47,6 +47,8 @@ namespace AzToolsFramework
        virtual QPixmap GenerateItemIcon(AZ::EntityId entityId) const;
        //! Returns whether the element's lock and visibility state should be accessible in the Outliner
        virtual bool CanToggleLockVisibility(AZ::EntityId entityId) const;
+        //! Returns whether the element's name should be editable
+        virtual bool CanRename(AZ::EntityId entityId) const;

        //! Paints the background of the item in the Outliner.
        virtual void PaintItemBackground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
@@ -192,6 +192,10 @@ namespace LegacyFramework
        // if we're in console mode, listen for CTRL+C
        ::SetConsoleCtrlHandler(CTRL_BREAK_HandlerRoutine, true);
 #endif
+
+        m_ptrCommandLineParser = aznew AzFramework::CommandLine();
+        m_ptrCommandLineParser->Parse(m_desc.m_argc, m_desc.m_argv);
+
        // If we don't have one create a serialize context
        if (GetSerializeContext() == nullptr)
        {
@@ -945,6 +945,12 @@ namespace AzToolsFramework
            return false;
        }

+        // Disable reparenting to the root level
+        if (!newParentId.IsValid())
+        {
+            return false;
+        }
+
        // Ignore entities not owned by the editor context. It is assumed that all entities belong
        // to the same context since multiple selection doesn't span across views.
        for (const AZ::EntityId& entityId : selectedEntityIds)
@@ -974,39 +980,33 @@ namespace AzToolsFramework
                }
            }

-            if (newParentId.IsValid())
+            bool isLayerEntity = false;
+            Layers::EditorLayerComponentRequestBus::EventResult(
+                isLayerEntity,
+                entityId,
+                &Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+            // Layers can only have other layers as parents, or have no parent.
+            if (isLayerEntity)
            {
-                bool isLayerEntity = false;
+                bool newParentIsLayer = false;
                Layers::EditorLayerComponentRequestBus::EventResult(
-                    isLayerEntity,
-                    entityId,
+                    newParentIsLayer,
+                    newParentId,
                    &Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-                // Layers can only have other layers as parents, or have no parent.
-                if (isLayerEntity)
+                if (!newParentIsLayer)
                {
-                    bool newParentIsLayer = false;
-                    Layers::EditorLayerComponentRequestBus::EventResult(
-                        newParentIsLayer,
-                        newParentId,
-                        &Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-                    if (!newParentIsLayer)
-                    {
-                        return false;
-                    }
+                    return false;
                }
            }
        }

        //Only check the entity pointer if the entity id is valid because
        //we want to allow dragging items to unoccupied parts of the tree to un-parent them
-        if (newParentId.IsValid())
+        AZ::Entity* newParentEntity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(newParentEntity, &AZ::ComponentApplicationRequests::FindEntity, newParentId);
+        if (!newParentEntity)
        {
-            AZ::Entity* newParentEntity = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(newParentEntity, &AZ::ComponentApplicationRequests::FindEntity, newParentId);
-            if (!newParentEntity)
-            {
-                return false;
-            }
+            return false;
        }

        //reject dragging on to yourself or your children
@@ -1344,14 +1344,15 @@ namespace AzToolsFramework
        emit EnableSelectionUpdates(false);
        auto parentIndex = GetIndexFromEntity(parentId);
        auto childIndex = GetIndexFromEntity(childId);
-        beginRemoveRows(parentIndex, childIndex.row(), childIndex.row());
+        beginResetModel();
    }

    void EntityOutlinerListModel::OnEntityInfoUpdatedRemoveChildEnd(AZ::EntityId parentId, AZ::EntityId childId)
    {
        (void)childId;
        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-        endRemoveRows();
+
+        endResetModel();

        //must refresh partial lock/visibility of parents
        m_isFilterDirty = true;
@@ -30,6 +30,7 @@
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 #include <AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.hxx>
+#include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h>
 #include <AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.h>
 #include <AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx>
 #include <AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.hxx>
@@ -271,6 +272,12 @@ namespace AzToolsFramework

        m_listModel->Initialize();

+        m_editorEntityUiInterface = AZ::Interface<AzToolsFramework::EditorEntityUiInterface>::Get();
+
+        AZ_Assert(
+            m_editorEntityUiInterface != nullptr,
+            "EntityOutlinerWidget requires a EditorEntityUiInterface instance on Initialize.");
+
        EditorPickModeNotificationBus::Handler::BusConnect(GetEntityContextId());
        EntityHighlightMessages::Bus::Handler::BusConnect();
        EntityOutlinerModelNotificationBus::Handler::BusConnect();
@@ -562,7 +569,13 @@ namespace AzToolsFramework

            if (m_selectedEntityIds.size() == 1)
            {
-                contextMenu->addAction(m_actionToRenameSelection);
+                auto entityId = m_selectedEntityIds.front();
+                auto entityUiHandler = m_editorEntityUiInterface->GetHandler(entityId);
+
+                if (!entityUiHandler || entityUiHandler->CanRename(entityId))
+                {
+                    contextMenu->addAction(m_actionToRenameSelection);
+                }
            }

            if (m_selectedEntityIds.size() == 1)
@@ -688,11 +701,17 @@ namespace AzToolsFramework

        if (m_selectedEntityIds.size() == 1)
        {
-            const QModelIndex proxyIndex = GetIndexFromEntityId(m_selectedEntityIds.front());
-            if (proxyIndex.isValid())
+            auto entityId = m_selectedEntityIds.front();
+            auto entityUiHandler = m_editorEntityUiInterface->GetHandler(entityId);
+
+            if (!entityUiHandler || entityUiHandler->CanRename(entityId))
            {
-                m_gui->m_objectTree->setCurrentIndex(proxyIndex);
-                m_gui->m_objectTree->QTreeView::edit(proxyIndex);
+                const QModelIndex proxyIndex = GetIndexFromEntityId(entityId);
+                if (proxyIndex.isValid())
+                {
+                    m_gui->m_objectTree->setCurrentIndex(proxyIndex);
+                    m_gui->m_objectTree->QTreeView::edit(proxyIndex);
+                }
            }
        }
    }
@@ -42,6 +42,7 @@ namespace Ui

 namespace AzToolsFramework
 {
+    class EditorEntityUiInterface;
    class EntityOutlinerListModel;
    class EntityOutlinerSortFilterProxyModel;

@@ -193,6 +194,8 @@ namespace AzToolsFramework
        EntityIdSet m_entitiesToSort;
        EntityOutliner::DisplaySortMode m_sortMode;
        bool m_sortContentQueued;
+
+        EditorEntityUiInterface* m_editorEntityUiInterface = nullptr;
    };

 }
@@ -50,11 +50,31 @@ namespace AzToolsFramework
        return QPixmap(m_levelRootIconPath);
    }

+    QString LevelRootUiHandler::GenerateItemInfoString(AZ::EntityId entityId) const
+    {
+        QString infoString;
+
+        AZ::IO::Path path = m_prefabPublicInterface->GetOwningInstancePrefabPath(entityId);
+
+        if (!path.empty())
+        {
+            infoString =
+                QObject::tr("<span style=\"font-style: italic; font-weight: 400;\">(%1)</span>").arg(path.Filename().Native().data());
+        }
+
+        return infoString;
+    }
+
    bool LevelRootUiHandler::CanToggleLockVisibility(AZ::EntityId /*entityId*/) const
    {
        return false;
    }

+    bool LevelRootUiHandler::CanRename(AZ::EntityId /*entityId*/) const
+    {
+        return false;
+    }
+
    void LevelRootUiHandler::PaintItemBackground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& /*index*/) const
    {
        if (!painter)
@@ -34,7 +34,9 @@ namespace AzToolsFramework

        // EditorEntityUiHandler...
        QPixmap GenerateItemIcon(AZ::EntityId entityId) const override;
+        QString GenerateItemInfoString(AZ::EntityId entityId) const override;
        bool CanToggleLockVisibility(AZ::EntityId entityId) const override;
+        bool CanRename(AZ::EntityId entityId) const override;
        void PaintItemBackground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;

    private:
@@ -310,6 +310,9 @@ namespace AzToolsFramework
    {
        initEntityPropertyEditorResources();

+        m_prefabPublicInterface = AZ::Interface<Prefab::PrefabPublicInterface>::Get();
+        AZ_Assert(m_prefabPublicInterface != nullptr, "EntityPropertyEditor requires a PrefabPublicInterface instance on Initialize.");
+
        setObjectName("EntityPropertyEditor");
        setAcceptDrops(true);

@@ -405,8 +408,6 @@ namespace AzToolsFramework
        CreateActions();
        UpdateContents();

-        m_prefabPublicInterface = AZ::Interface<Prefab::PrefabPublicInterface>::Get();
-
        EditorEntityContextNotificationBus::Handler::BusConnect();

        //forced to register global event filter with application for selection
@@ -693,11 +694,38 @@ namespace AzToolsFramework
        m_gui->m_entityIcon->repaint();
    }

+    EntityPropertyEditor::InspectorLayout EntityPropertyEditor::GetCurrentInspectorLayout() const
+    {
+        if (!m_prefabsAreEnabled)
+        {
+            return m_isLevelEntityEditor ? InspectorLayout::LEVEL : InspectorLayout::ENTITY;
+        }
+
+        AZ::EntityId levelContainerEntityId = m_prefabPublicInterface->GetLevelInstanceContainerEntityId();
+        if (AZStd::find(m_selectedEntityIds.begin(), m_selectedEntityIds.end(), levelContainerEntityId) != m_selectedEntityIds.end())
+        {
+            if (m_selectedEntityIds.size() > 1)
+            {
+                return InspectorLayout::INVALID;
+            }
+            else
+            {
+                return InspectorLayout::LEVEL;
+            }
+        }
+        else
+        {
+            return InspectorLayout::ENTITY;
+        }
+    }
+
    void EntityPropertyEditor::UpdateEntityDisplay()
    {
        UpdateStatusComboBox();

-        if (m_isLevelEntityEditor)
+        InspectorLayout layout = GetCurrentInspectorLayout();
+
+        if (layout == InspectorLayout::LEVEL)
        {
            AZStd::string levelName;
            AzToolsFramework::EditorRequestBus::BroadcastResult(levelName, &AzToolsFramework::EditorRequests::GetLevelName);
@@ -737,13 +765,20 @@ namespace AzToolsFramework
        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
        SelectionEntityTypeInfo result = SelectionEntityTypeInfo::None;

-        if (m_isLevelEntityEditor)
+        InspectorLayout layout = GetCurrentInspectorLayout();
+
+        if (layout == InspectorLayout::LEVEL)
        {
            // The Level Inspector should only have a list of selectable components after the
            // level entity itself is valid (i.e. "selected").
            return selection.empty() ? SelectionEntityTypeInfo::None : SelectionEntityTypeInfo::LevelEntity;
        }

+        if (layout == InspectorLayout::INVALID)
+        {
+            return SelectionEntityTypeInfo::Mixed;
+        }
+
        for (AZ::EntityId selectedEntityId : selection)
        {
            bool isLayerEntity = false;
@@ -909,16 +944,18 @@ namespace AzToolsFramework
            }
        }

+        bool isLevelLayout = GetCurrentInspectorLayout() == InspectorLayout::LEVEL;
+
        m_gui->m_entityDetailsLabel->setText(entityDetailsLabelText);
        m_gui->m_entityDetailsLabel->setVisible(entityDetailsVisible);
        m_gui->m_entityNameEditor->setVisible(hasEntitiesDisplayed);
        m_gui->m_entityNameLabel->setVisible(hasEntitiesDisplayed);
        m_gui->m_entityIcon->setVisible(hasEntitiesDisplayed);
-        m_gui->m_pinButton->setVisible(m_overrideSelectedEntityIds.empty() && hasEntitiesDisplayed && !m_isSystemEntityEditor && !m_isLevelEntityEditor);
-        m_gui->m_statusLabel->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !m_isLevelEntityEditor);
-        m_gui->m_statusComboBox->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !m_isLevelEntityEditor);
-        m_gui->m_entityIdLabel->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !m_isLevelEntityEditor);
-        m_gui->m_entityIdText->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !m_isLevelEntityEditor);
+        m_gui->m_pinButton->setVisible(m_overrideSelectedEntityIds.empty() && hasEntitiesDisplayed && !m_isSystemEntityEditor);
+        m_gui->m_statusLabel->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
+        m_gui->m_statusComboBox->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
+        m_gui->m_entityIdLabel->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
+        m_gui->m_entityIdText->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);

        bool displayComponentSearchBox = hasEntitiesDisplayed;
        if (hasEntitiesDisplayed)
@@ -941,7 +978,7 @@ namespace AzToolsFramework
            UpdateEntityDisplay();
        }

-        m_gui->m_darkBox->setVisible(displayComponentSearchBox && !m_isSystemEntityEditor && !m_isLevelEntityEditor);
+        m_gui->m_darkBox->setVisible(displayComponentSearchBox && !m_isSystemEntityEditor && !isLevelLayout);
        m_gui->m_entitySearchBox->setVisible(displayComponentSearchBox);

        bool displayAddComponentMenu = CanAddComponentsToSelection(selectionEntityTypeInfo);
@@ -521,6 +521,15 @@ namespace AzToolsFramework
        bool m_isSystemEntityEditor;
        bool m_isLevelEntityEditor = false;

+        enum class InspectorLayout
+        {
+            ENTITY = 0,     // All selected entities are regular entities
+            LEVEL,          // The selected entity is the level prefab container entity
+            INVALID         // Other entities are selected alongside the level prefab container entity
+        };
+
+        InspectorLayout GetCurrentInspectorLayout() const;
+
        // the spacer's job is to make sure that its always at the end of the list of components.
        QSpacerItem* m_spacer;
        bool m_isAlreadyQueuedRefresh;