DYN-4305: After panning, sometimes zooming doesn't zoom into the mous…

…e position (#13095) * WIP check-in * Set offset fix * Cleanup code * Revert one change. * Use child methods
DynamoDS · Aug 2, 2022 · 99215f1 · 99215f1
1 parent a450f7a
commit 99215f1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/src/DynamoCoreWpf/Controls/ZoomBorder.cs b/src/DynamoCoreWpf/Controls/ZoomBorder.cs
@@ -100,29 +100,34 @@ public Point GetTranslateTransformOrigin()
 
         public void SetTranslateTransformOrigin(Point2D p)
         {
-            var tt = GetTranslateTransform(child);
-            tt.X = p.X;
-            tt.Y = p.Y;
+            var tt = GetChildTranslateTransform();
+            if (tt.X != p.X || tt.Y != p.Y)
+            {
+                tt.X = p.X;
+                tt.Y = p.Y;
 
-            var st = GetScaleTransform(child);
-            NotifyViewSettingsChanged(tt.X, tt.Y, st.ScaleX);
+                var st = GetChildScaleTransform();
+                NotifyViewSettingsChanged(tt.X, tt.Y, st.ScaleX);
+            }
         }
 
         public void SetZoom(double zoom)
         {
-            var st = GetScaleTransform(child);
-            st.ScaleX = zoom;
-            st.ScaleY = zoom;
-
-            var tt = GetTranslateTransform(child);
-            NotifyViewSettingsChanged(tt.X, tt.Y, zoom);
+            var st = GetChildScaleTransform();
+            if (st.ScaleX != zoom || st.ScaleY != zoom)
+            {
+                st.ScaleX = zoom;
+                st.ScaleY = zoom;
+                var tt = GetChildTranslateTransform();
+                NotifyViewSettingsChanged(tt.X, tt.Y, zoom);
+            }
         }
 
         #region Child Events
 
         private void child_MouseWheel(object sender, MouseWheelEventArgs e)
         {
-            if (child != null)
+            if (child != null && !child.IsMouseCaptured)
             {
                 //double zoom = e.Delta > 0 ? .1 : -.1;
                 double zoom = e.Delta > 0 ? 1 : -1;
@@ -145,7 +150,7 @@ private void child_MouseDown(object sender, MouseButtonEventArgs e)
                 (e.ChangedButton == MouseButton.Middle
                 || e.ChangedButton == MouseButton.Left && IsInPanMode()))
             {
-                var tt = GetTranslateTransform(child);
+                var tt = GetChildTranslateTransform();
                 start = e.GetPosition(this);
                 origin = new Point(tt.X, tt.Y);
                 child.CaptureMouse();
@@ -173,6 +178,12 @@ private void child_MouseMove(object sender, MouseEventArgs e)
 
             // Change ZoomBorder's child translation
             Vector v = start - e.GetPosition(this);
+
+            if (v.Length == 0.0)
+            {
+                return;
+            }
+
             SetTranslateTransformOrigin(new Point2D
             {
                 X = origin.X - v.X,
@@ -202,7 +213,6 @@ private void NotifyViewSettingsChanged(double x, double y, double zoom)
                 handler(new ViewSettingsChangedEventArgs(x, y, zoom));
             }
         }
-
         #endregion
     }
 }
diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
@@ -1310,7 +1310,7 @@ private void SetCurrentOffset(object parameter)
 
             //set the current offset without triggering
             //any property change notices.
-            if (Model.X != p.X && Model.Y != p.Y)
+            if (Model.X != p.X || Model.Y != p.Y)
             {
                 Model.X = p.X;
                 Model.Y = p.Y;