Skip to content

Commit 307fe2f

Browse files
committed
refactor & fix ZoomToFit not unhiding nodes
1 parent 9a21a7f commit 307fe2f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/Blazor.Diagrams.Core/Default/PanSubManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private void DiagramManager_MouseMove(Model model, MouseEventArgs e)
3434

3535
var deltaX = e.ClientX - _lastClientX - (DiagramManager.Pan.X - _initialPan.X);
3636
var deltaY = e.ClientY - _lastClientY - (DiagramManager.Pan.Y - _initialPan.Y);
37-
DiagramManager.ChangePan(deltaX, deltaY);
37+
DiagramManager.UpdatePan(deltaX, deltaY);
3838
}
3939

4040
private void DiagramManager_MouseUp(Model model, MouseEventArgs e)

src/Blazor.Diagrams.Core/Default/ZoomSubManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private void DiagramManager_Wheel(WheelEventArgs e)
3838
var newPanY = DiagramManager.Pan.Y - heightDiff * yFactor;
3939

4040
DiagramManager.Pan = new Point(newPanX, newPanY);
41-
DiagramManager.ChangeZoom(newZoom);
41+
DiagramManager.SetZoom(newZoom);
4242
}
4343

4444
public override void Dispose()

src/Blazor.Diagrams.Core/DiagramManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public void ZoomToFit(double margin = 10)
312312

313313
var nx = Container.Left + Pan.X + minX * Zoom;
314314
var ny = Container.Top + Pan.Y + minY * Zoom;
315-
Pan = Pan.Add(Container.Left - nx, Container.Top - ny);
315+
UpdatePan(Container.Left - nx, Container.Top - ny);
316316

317317
Refresh();
318318
}
@@ -350,21 +350,21 @@ public void ZoomToFit(double margin = 10)
350350
return (minX, maxX, minY, maxY);
351351
}
352352

353-
public void ChangePan(double deltaX, double deltaY)
353+
public void UpdatePan(double deltaX, double deltaY)
354354
{
355355
Pan = Pan.Add(deltaX, deltaY);
356356
PanChanged?.Invoke();
357357
Refresh();
358358
}
359359

360-
public void ChangeZoom(double newZoom)
360+
public void SetZoom(double newZoom)
361361
{
362362
Zoom = newZoom;
363363
ZoomChanged?.Invoke();
364364
Refresh();
365365
}
366366

367-
internal void ChangeContainer(Rectangle newRect)
367+
internal void SetContainer(Rectangle newRect)
368368
{
369369
Container = newRect;
370370
ContainerChanged?.Invoke();

src/Blazor.Diagrams/Components/DiagramCanvas.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
5353
}
5454

5555
[JSInvokable]
56-
public void OnResize(Rectangle rect) => DiagramManager.ChangeContainer(rect);
56+
public void OnResize(Rectangle rect) => DiagramManager.SetContainer(rect);
5757

5858
protected override bool ShouldRender()
5959
{

0 commit comments

Comments
 (0)