Merge pull request o3de#17482 from aws-lumberyard-dev/daimini/dpe/VectorClearFix

DPE | Layout classes rewrite to fix refresh issues with containers.

Author: AMZN-daimini

Code/Framework/AzFramework/AzFramework/DocumentPropertyEditor/PropertyEditorNodes.h

@@ -228,6 +228,7 @@ namespace AZ::DocumentPropertyEditor::Nodes
 
     enum class ContainerAction
     {
+        None = 0,
         AddElement,
         RemoveElement,
         Clear,

Code/Framework/AzFramework/AzFramework/DocumentPropertyEditor/Reflection/LegacyReflectionBridge.cpp

@@ -1801,7 +1801,7 @@ namespace AZ::Reflection
         if (serializeContext == nullptr)
         {
             AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
-            AZ_Assert(serializeContext != nullptr, "Unable to retreive a SerializeContext");
+            AZ_Assert(serializeContext != nullptr, "Unable to retrieve a SerializeContext");
         }
 
         LegacyReflectionInternal::InstanceVisitor helper(visitor, instance, typeId, serializeContext);

Code/Framework/AzFramework/AzFramework/DocumentPropertyEditor/Reflection/LegacyReflectionBridge.h

@@ -90,7 +90,7 @@ namespace AZ::Reflection::LegacyReflectionInternal
     {
         AZ_TYPE_INFO(KeyEntry, "{718537E1-DFF5-4662-AB86-1D5C0C8A0768}");
 
-        //! Stores the address and type ID of an associative contaienr key
+        //! Stores the address and type ID of an associative container key
         AZ::PointerObject m_keyInstance;
         //! Stores the attributes of a single associative container element key
         AZStd::vector<AttributeData> m_keyAttributes;

Code/Framework/AzToolsFramework/AzToolsFramework/UI/DocumentPropertyEditor/ContainerActionButtonHandler.cpp

@@ -18,43 +18,72 @@ namespace AzToolsFramework
 
     void ContainerActionButtonHandler::SetValueFromDom(const AZ::Dom::Value& node)
     {
-        GenericButtonHandler::SetValueFromDom(node);
 
-        static QIcon s_iconAdd(QStringLiteral(":/stylesheet/img/UI20/add-16.svg"));
-        static QIcon s_iconRemove(QStringLiteral(":/stylesheet/img/UI20/delete-16.svg"));
-        static QIcon s_iconClear(QStringLiteral(":/stylesheet/img/UI20/delete-16.svg"));
-        static QIcon s_iconUp(QStringLiteral(":/stylesheet/img/indicator-arrow-up.svg"));
-        static QIcon s_iconDown(QStringLiteral(":/stylesheet/img/indicator-arrow-down.svg"));
+        static const QIcon s_iconAdd(QStringLiteral(":/stylesheet/img/UI20/add-16.svg"));
+        static const QIcon s_iconRemove(QStringLiteral(":/stylesheet/img/UI20/delete-16.svg"));
+        static const QIcon s_iconClear(QStringLiteral(":/stylesheet/img/UI20/delete-16.svg"));
+        static const QIcon s_iconUp(QStringLiteral(":/stylesheet/img/indicator-arrow-up.svg"));
+        static const QIcon s_iconDown(QStringLiteral(":/stylesheet/img/indicator-arrow-down.svg"));
 
         using AZ::DocumentPropertyEditor::Nodes::ContainerAction;
         using AZ::DocumentPropertyEditor::Nodes::ContainerActionButton;
 
+        GenericButtonHandler::SetValueFromDom(node);
+
+        auto oldAction = m_action;
         m_action = ContainerActionButton::Action.ExtractFromDomNode(node).value_or(ContainerAction::AddElement);
+
+        if (m_action == oldAction)
+        {
+            return;
+        }
+
         switch (m_action)
         {
         case ContainerAction::AddElement:
-            setIcon(s_iconAdd);
-            setToolTip("Add new child element");
-            break;
+            {
+                setIcon(s_iconAdd);
+                setToolTip(tr("Add new child element"));
+                break;
+            }
         case ContainerAction::RemoveElement:
-            setIcon(s_iconRemove);
-            setToolTip(tr("Remove this element"));
-            break;
+            {
+                setIcon(s_iconRemove);
+                setToolTip(tr("Remove this element"));
+                break;
+            }
         case ContainerAction::Clear:
-            setIcon(s_iconClear);
-            setToolTip(tr("Remove all elements"));
-            break;
+            {
+                setIcon(s_iconClear);
+                setToolTip(tr("Remove all elements"));
+                break;
+            }
         case ContainerAction::MoveUp:
-            setIcon(s_iconUp);
-            setToolTip(tr("move this element up"));
-            break;
+            {
+                setIcon(s_iconUp);
+                setToolTip(tr("move this element up"));
+                break;
+            }
         case ContainerAction::MoveDown:
-            setIcon(s_iconDown);
-            setToolTip(tr("move this element down"));
-            break;
+            {
+                setIcon(s_iconDown);
+                setToolTip(tr("move this element down"));
+                break;
+            }
+        case ContainerAction::None:
+        default:
+            {
+                AZ_Error("DPE", false, "ContainerActionButtonHandler::SetValueFromDom passed invalid action!");
+                break;
+            }
         }
     }
 
+    bool ContainerActionButtonHandler::ResetToDefaults()
+    {
+        return GenericButtonHandler::ResetToDefaults();
+    }
+
     void ContainerActionButtonHandler::OnClicked()
     {
         using AZ::DocumentPropertyEditor::Nodes::Container;

Code/Framework/AzToolsFramework/AzToolsFramework/UI/DocumentPropertyEditor/ContainerActionButtonHandler.h

@@ -18,6 +18,7 @@ namespace AzToolsFramework
         ContainerActionButtonHandler();
 
         void SetValueFromDom(const AZ::Dom::Value& node) override;
+        virtual bool ResetToDefaults() override;
 
         static constexpr const AZStd::string_view GetHandlerName()
         {