Skip to content

Commit a021ac9

Browse files
author
Carl Chang
committed
add animation to drag move;
smooth zooming animation;
1 parent 5e74a86 commit a021ac9

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

ViewWindow.xaml.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,9 @@ private void CA_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e
149149

150150
private void CA_PreviewMouseMove(object sender, MouseEventArgs e) {
151151
if (!CA.IsMouseCaptured) return;
152-
IM_TT.BeginAnimation(TranslateTransform.XProperty, null);
153-
IM_TT.BeginAnimation(TranslateTransform.YProperty, null);
154-
IM_TT.X = existingTranslate.OffsetX + ((e.GetPosition(CA).X - mouseCapturePoint.X) * Scale * 2d).RoundToMultiplesOf(IM.TransformFromDevice.M11);
155-
IM_TT.Y = existingTranslate.OffsetY + ((e.GetPosition(CA).Y - mouseCapturePoint.Y) * Scale * 2d).RoundToMultiplesOf(IM.TransformFromDevice.M22);
152+
transform(50, transPoint:
153+
new Point(existingTranslate.OffsetX + ((e.GetPosition(CA).X - mouseCapturePoint.X) * Scale * 2d).RoundToMultiplesOf(IM.TransformFromDevice.M11),
154+
existingTranslate.OffsetY + ((e.GetPosition(CA).Y - mouseCapturePoint.Y) * Scale * 2d).RoundToMultiplesOf(IM.TransformFromDevice.M22)));
156155
}
157156

158157
private void CA_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
@@ -162,7 +161,7 @@ private void CA_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
162161

163162

164163
private void CA_PreviewMouseWheel(object sender, MouseWheelEventArgs e) {
165-
if (Transforming) return;
164+
//if (Transforming) return;
166165
var scale = e.Delta > 0 ? 1.25d : 0.8d;
167166
scaleCenterMouse(e.GetPosition(IM), new Size(IM.Width * scale, IM.Height * scale), 80);
168167
}

0 commit comments

Comments
 (0)