From 7cb6ef4f47a3bc73b733963fa766f6e4687105a6 Mon Sep 17 00:00:00 2001 From: John Jones-Steele Date: Wed, 21 Jul 2021 15:00:46 +0100 Subject: [PATCH] Checked for no Entity selected and fixed UI Signed-off-by: John Jones-Steele --- .../PropertyEditor/EntityPropertyEditor.cpp | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp index 6e54a72b0f..319307009c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp @@ -4965,21 +4965,29 @@ namespace AzToolsFramework void EntityPropertyEditor::SetEditorUiEnabled(bool enable) { - if (enable) + if (!m_selectedEntityIds.empty()) { - EnableComponentActions(this, m_entityComponentActions); + if (enable) + { + EnableComponentActions(this, m_entityComponentActions); + } + else + { + DisableComponentActions(this, m_entityComponentActions); + } + SetPropertyEditorState(m_gui, enable); + + for (auto componentEditor : m_componentEditors) + { + AzQtComponents::SetWidgetInteractEnabled(componentEditor, enable); + } } else { - DisableComponentActions(this, m_entityComponentActions); + AzQtComponents::SetWidgetInteractEnabled(m_gui->m_entityDetailsLabel, enable); } m_disabled = !enable; - SetPropertyEditorState(m_gui, enable); - for (auto componentEditor : m_componentEditors) - { - AzQtComponents::SetWidgetInteractEnabled(componentEditor, enable); - } // record the selected state after entering/leaving component mode SaveComponentEditorState(); }