Fix ZoomToFit

This commit is contained in:
Paddy Xu
2017-08-12 21:21:16 +03:00
parent 3e2336a63d
commit 6027a387b0

View File

@@ -286,7 +286,7 @@ namespace QuickLook.Plugin.ImageViewer
ZoomToFitFactor = factor; ZoomToFitFactor = factor;
Zoom(factor); Zoom(factor, false, true);
} }
public void ResetZoom() public void ResetZoom()
@@ -294,7 +294,7 @@ namespace QuickLook.Plugin.ImageViewer
Zoom(1d, true); Zoom(1d, true);
} }
public void Zoom(double factor, bool suppressEvent = false) public void Zoom(double factor, bool suppressEvent = false, bool isToFit = false)
{ {
if (viewPanelImage.Source == null) if (viewPanelImage.Source == null)
return; return;
@@ -305,6 +305,11 @@ namespace QuickLook.Plugin.ImageViewer
factor = ZoomToFitFactor; factor = ZoomToFitFactor;
ZoomToFit = true; ZoomToFit = true;
} }
else
{
if (!isToFit)
ZoomToFit = false;
}
factor = Math.Max(factor, MinZoomFactor); factor = Math.Max(factor, MinZoomFactor);
factor = Math.Min(factor, MaxZoomFactor); factor = Math.Min(factor, MaxZoomFactor);