Started using Pan Changed for DragNewLinkBehavior

WiseTechGlobal · Jan 4, 2024 · 0e8e39a · 0e8e39a
1 parent b6ac41b
commit 0e8e39a
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 19 deletions.
diff --git a/src/Blazor.Diagrams.Core/Behaviors/DebugEventsBehavior.cs b/src/Blazor.Diagrams.Core/Behaviors/DebugEventsBehavior.cs
@@ -52,7 +52,7 @@ private void Nodes_Added(NodeModel obj)
         Console.WriteLine($"Nodes.Added, Nodes=[{obj}]");
     }
 
-    private void Diagram_PanChanged(double deltaX, double deltaY)
+    private void Diagram_PanChanged(double deltaX, double deltaY, double clientX, double clientY)
     {
         Console.WriteLine($"PanChanged, Pan={Diagram.Pan}");
     }

diff --git a/src/Blazor.Diagrams.Core/Behaviors/DragMovablesBehavior.cs b/src/Blazor.Diagrams.Core/Behaviors/DragMovablesBehavior.cs
@@ -74,7 +74,7 @@ private void OnPointerMove(Model? model, PointerEventArgs e)
         _lastClientY = e.ClientY;
 
     }
-    public void OnPanChanged(double deltaX, double deltaY)
+    public void OnPanChanged(double deltaX, double deltaY, double clientX, double clientY)
     {
         if (_initialPositions.Count == 0 || _lastClientX == null || _lastClientY == null)
             return;

diff --git a/src/Blazor.Diagrams.Core/Behaviors/DragNewLinkBehavior.cs b/src/Blazor.Diagrams.Core/Behaviors/DragNewLinkBehavior.cs
@@ -20,7 +20,7 @@ public DragNewLinkBehavior(Diagram diagram) : base(diagram)
         Diagram.PointerDown += OnPointerDown;
         Diagram.PointerMove += OnPointerMove;
         Diagram.PointerUp += OnPointerUp;
-        Diagram.Wheel += OnWheel;
+        Diagram.PanChanged += OnPanChanged;
     }
 
     public void StartFrom(ILinkable source, double clientX, double clientY)
@@ -79,12 +79,12 @@ private void OnPointerMove(Model? model, MouseEventArgs e)
         UpdateLinkPosition(e.ClientX, e.ClientY);
     }
 
-    private void OnWheel(WheelEventArgs e)
+    private void OnPanChanged(double deltaX, double deltaY, double clientX, double clientY)
     {
         if (OngoingLink == null)
             return;
 
-        UpdateLinkPosition(e.ClientX + e.DeltaX, e.ClientY + e.DeltaY);
+        UpdateLinkPosition(clientX + deltaX, clientY + deltaY);
     }
 
     private void UpdateLinkPosition(double clientX, double clientY)
@@ -183,6 +183,6 @@ public override void Dispose()
         Diagram.PointerDown -= OnPointerDown;
         Diagram.PointerMove -= OnPointerMove;
         Diagram.PointerUp -= OnPointerUp;
-        Diagram.Wheel -= OnWheel;
+        Diagram.PanChanged -= OnPanChanged;
     }
 }
diff --git a/src/Blazor.Diagrams.Core/Behaviors/ScrollBehavior.cs b/src/Blazor.Diagrams.Core/Behaviors/ScrollBehavior.cs
@@ -26,7 +26,7 @@ protected override void OnDiagramWheel(WheelEventArgs e)
             var deltaX = e.ClientX - _lastClientX + (Diagram.Pan.X - x);
             var deltaY = e.ClientY - _lastClientY + (Diagram.Pan.Y - y);
 
-            Diagram.SetPan(x, y, deltaX, deltaY);
+            Diagram.SetPan(x, y, deltaX, deltaY, _lastClientX, _lastClientY);
         }
     }
 }
diff --git a/src/Blazor.Diagrams.Core/Behaviors/VirtualizationBehavior.cs b/src/Blazor.Diagrams.Core/Behaviors/VirtualizationBehavior.cs
@@ -12,7 +12,7 @@ public VirtualizationBehavior(Diagram diagram) : base(diagram)
         Diagram.ContainerChanged += CheckVisibility;
     }
 
-    private void CheckVisibility(double deltaX, double deltaY)
+    private void CheckVisibility(double deltaX, double deltaY, double clientX, double clientY)
     {
         CheckVisibility();
     }

diff --git a/src/Blazor.Diagrams.Core/Behaviors/ZoomBehavior.cs b/src/Blazor.Diagrams.Core/Behaviors/ZoomBehavior.cs
@@ -39,7 +39,7 @@ protected override void OnDiagramWheel(WheelEventArgs e)
 
         Diagram.Batch(() =>
         {
-            Diagram.SetPan(newPanX, newPanY, 0, 0);
+            Diagram.SetPan(newPanX, newPanY, 0, 0, 0, 0);
             Diagram.SetZoom(newZoom);
         });
     }

diff --git a/src/Blazor.Diagrams.Core/Diagram.cs b/src/Blazor.Diagrams.Core/Diagram.cs
@@ -34,7 +34,7 @@ public abstract class Diagram
     public event Action<Model?, PointerEventArgs>? PointerDoubleClick;
 
     public event Action<SelectableModel>? SelectionChanged;
-    public event Action<double, double>? PanChanged;
+    public event Action<double, double, double, double>? PanChanged;
     public event Action? ZoomChanged;
     public event Action? ContainerChanged;
     public event Action? Changed;
@@ -237,17 +237,17 @@ public void ZoomToFit(double margin = 10)
         Refresh();
     }
 
-    public void SetPan(double x, double y, double deltaX, double deltaY)
+    public void SetPan(double x, double y, double deltaX, double deltaY, double clientX, double clientY)
     {
         Pan = new Point(x, y);
-        PanChanged?.Invoke(deltaX, deltaY);
+        PanChanged?.Invoke(deltaX, deltaY, clientX, clientY);
         Refresh();
     }
 
     public void UpdatePan(double deltaX, double deltaY)
     {
         Pan = Pan.Add(deltaX, deltaY);
-        PanChanged?.Invoke(deltaX, deltaY);
+        PanChanged?.Invoke(deltaX, deltaY, 0, 0);
         Refresh();
     }
 

diff --git a/src/Blazor.Diagrams.Core/Positions/Resizing/BottomLeftResizerProvider.cs b/src/Blazor.Diagrams.Core/Positions/Resizing/BottomLeftResizerProvider.cs
@@ -51,7 +51,7 @@ public void OnPointerMove(Model? model, PointerEventArgs e)
             ResizeNode(deltaX, deltaY);
         }
 
-        public void OnPanChanged(double deltaX, double deltaY)
+        public void OnPanChanged(double deltaX, double deltaY, double clientX, double clientY)
         {
             if (_nodeModel is null) return;
 

diff --git a/src/Blazor.Diagrams.Core/Positions/Resizing/BottomRightResizerProvider.cs b/src/Blazor.Diagrams.Core/Positions/Resizing/BottomRightResizerProvider.cs
@@ -49,7 +49,7 @@ public void OnPointerMove(Model? model, PointerEventArgs e)
             ResizeNode(deltaX, deltaY);
         }
 
-        public void OnPanChanged(double deltaX, double deltaY)
+        public void OnPanChanged(double deltaX, double deltaY, double clientX, double clientY)
         {
             if (_nodeModel is null) return;
 

diff --git a/src/Blazor.Diagrams.Core/Positions/Resizing/IResizerProvider.cs b/src/Blazor.Diagrams.Core/Positions/Resizing/IResizerProvider.cs
@@ -9,7 +9,7 @@ public interface IResizerProvider : IPositionProvider
         public string? Class { get; }
         public void OnResizeStart(Diagram diagram, Model model, PointerEventArgs eventArgs);
         public void OnPointerMove(Model? model, PointerEventArgs args);
-        public void OnPanChanged(double deltaX, double deltaY);
+        public void OnPanChanged(double deltaX, double deltaY, double clientX, double clientY);
         public void OnResizeEnd(Model? model, PointerEventArgs args);
     }
 }
diff --git a/src/Blazor.Diagrams.Core/Positions/Resizing/TopLeftResizerProvider.cs b/src/Blazor.Diagrams.Core/Positions/Resizing/TopLeftResizerProvider.cs
@@ -51,7 +51,7 @@ public void OnPointerMove(Model? model, PointerEventArgs e)
             ResizeNode(deltaX, deltaY);
         }
 
-        public void OnPanChanged(double deltaX, double deltaY)
+        public void OnPanChanged(double deltaX, double deltaY, double clientX, double clientY)
         {
             if (_nodeModel is null) return;
 

diff --git a/src/Blazor.Diagrams.Core/Positions/Resizing/TopRightResizerProvider.cs b/src/Blazor.Diagrams.Core/Positions/Resizing/TopRightResizerProvider.cs
@@ -51,7 +51,7 @@ public void OnPointerMove(Model? model, PointerEventArgs e)
             ResizeNode(deltaX, deltaY);
         }
 
-        public void OnPanChanged(double deltaX, double deltaY)
+        public void OnPanChanged(double deltaX, double deltaY, double clientX, double clientY)
         {
             if (_nodeModel is null) return;
 

diff --git a/src/Blazor.Diagrams/Components/Widgets/GridWidget.razor.cs b/src/Blazor.Diagrams/Components/Widgets/GridWidget.razor.cs
@@ -38,7 +38,7 @@ protected override void OnParametersSet()
         _visible = BlazorDiagram.Zoom > ZoomThreshold;
     }
 
-    private void RefreshPosition(double deltaX, double deltaY)
+    private void RefreshPosition(double deltaX, double deltaY, double clientX, double clientY)
     {
         RefreshPosition();
     }