Integrating latest 47acbe8

Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp

@@ -32,7 +32,9 @@ namespace GraphCanvas
     }
 
     ConnectionLayerControllerComponent::ConnectionLayerControllerComponent()
-        : LayerControllerComponent("ConnectionLayer")
+        : LayerControllerComponent("ConnectionLayer", ConnectionOffset)
+        , m_sourceLayerController(nullptr)
+        , m_targetLayerController(nullptr)
     {
     }
 
@@ -43,9 +45,16 @@ namespace GraphCanvas
         ConnectionNotificationBus::Handler::BusConnect(GetEntityId());
     }
 
+    void ConnectionLayerControllerComponent::OnSceneSet(const AZ::EntityId& sceneId)
+    {
+        LayerControllerComponent::OnSceneSet(sceneId);
+        UpdateEndpoints();
+    }
+
     void ConnectionLayerControllerComponent::OnMoveBegin()
     {
         SetBaseModifier("editing");
+        UpdateEndpoints();
     }
 
     void ConnectionLayerControllerComponent::OnMoveFinalized(bool isValidConnection)
@@ -53,6 +62,66 @@ namespace GraphCanvas
         if (isValidConnection)
         {
             SetBaseModifier("");
+            UpdateEndpoints();
         }
     }
+
+    void ConnectionLayerControllerComponent::OnSourceSlotIdChanged(const AZ::EntityId&, const AZ::EntityId&)
+    {
+        UpdateEndpoints();
+    }
+
+    void ConnectionLayerControllerComponent::OnTargetSlotIdChanged(const AZ::EntityId&, const AZ::EntityId&)
+    {
+        UpdateEndpoints();
+    }
+
+    void ConnectionLayerControllerComponent::OnOffsetsChanged(int selectionOffset, int groupOffset)
+    {
+        selectionOffset = 0;
+        groupOffset = 0;
+
+        if (m_sourceLayerController)
+        {
+            groupOffset = m_sourceLayerController->GetGroupLayerOffset();
+            selectionOffset = m_sourceLayerController->GetGroupLayerOffset();
+        }
+
+        if (m_targetLayerController)
+        {
+            // Need to use min offset here, otherwise connections can be above nodes. Which causes some wierd UX issues
+            groupOffset = AZStd::min(m_targetLayerController->GetGroupLayerOffset(), groupOffset);
+            selectionOffset = AZStd::min(m_targetLayerController->GetGroupLayerOffset(), selectionOffset);
+        }
+
+        SetGroupLayerOffset(groupOffset);
+        SetSelectionLayerOffset(selectionOffset);
+    }
+
+    void ConnectionLayerControllerComponent::UpdateEndpoints()
+    {
+        LayerControllerNotificationBus::MultiHandler::BusDisconnect();
+
+        Endpoint sourceEndpoint;
+        ConnectionRequestBus::EventResult(sourceEndpoint, GetEntityId(), &ConnectionRequests::GetSourceEndpoint);
+
+        m_sourceLayerController = LayerControllerRequestBus::FindFirstHandler(sourceEndpoint.GetNodeId());
+
+        if (m_sourceLayerController)
+        {
+            LayerControllerNotificationBus::MultiHandler::BusConnect(sourceEndpoint.GetNodeId());
+        }
+
+        Endpoint targetEndpoint;
+        ConnectionRequestBus::EventResult(targetEndpoint, GetEntityId(), &ConnectionRequests::GetTargetEndpoint);
+
+        m_targetLayerController = LayerControllerRequestBus::FindFirstHandler(targetEndpoint.GetNodeId());
+
+        if (m_targetLayerController)
+        {
+            LayerControllerNotificationBus::MultiHandler::BusConnect(targetEndpoint.GetNodeId());
+        }
+
+        OnOffsetsChanged(0, 0);
+    }
 }