Merge pull request panthernet#1 from DaKaLKa/master

+ Fixed: ZoomControl ignores MaxZoom on FitToFill
gam4er · Feb 24, 2014 · 8a9f321 · 8a9f321
2 parents da6201f + ebfd2fb
commit 8a9f321
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/GraphX.Controls/Controls/ZoomControl/ZoomControl.cs b/GraphX.Controls/Controls/ZoomControl/ZoomControl.cs
@@ -1396,7 +1396,7 @@ private void DoZoomToFill()
  if (_presenter == null)
  return;
  var c = IsContentGraphArea ? GraphAreaContent.ContentSize.Size : ContentVisual.DesiredSize;
- var deltaZoom = Math.Min( ActualWidth / (c.Width), ActualHeight / (c.Height));
+ var deltaZoom = Math.Min(MaxZoom,Math.Min( ActualWidth / (c.Width), ActualHeight / (c.Height)));
  var initialTranslate = IsContentGraphArea ? GetGraphTranslate() : GetInitialTranslate(c.Width, c.Height);
  DoZoomAnimation(deltaZoom, initialTranslate.X * deltaZoom, initialTranslate.Y * deltaZoom);
  }