chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改了一处错误的判断

Browse Source
This commit is contained in:
杨劼
2024-06-03 16:15:48 +08:00
parent 2e1b776bb6
commit ea8e2d35cc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ursa/Controls/ImageViewer/ImageViewer.cs
View File

@@ -193,11 +193,6 @@ public class ImageViewer: TemplatedControl
private void OnMinScaleChanged(AvaloniaPropertyChangedEventArgs args) private void OnMinScaleChanged(AvaloniaPropertyChangedEventArgs args)
{ {
var newMinScale = args.GetNewValue<double>();
if (newMinScale > Scale)
{
Scale = newMinScale;
}
if (_image is { }) if (_image is { })
{ {
_sourceMinScale = Math.Min(Width * MinScale / _image.Width, Height * MinScale / _image.Height); _sourceMinScale = Math.Min(Width * MinScale / _image.Width, Height * MinScale / _image.Height);
@@ -206,6 +201,11 @@ public class ImageViewer: TemplatedControl
{ {
_sourceMinScale = MinScale; _sourceMinScale = MinScale;
} }
if (_sourceMinScale > Scale)
{
Scale = _sourceMinScale;
}
} }
private double GetScaleRatio(double widthRatio, double heightRatio, Stretch stretch) private double GetScaleRatio(double widthRatio, double heightRatio, Stretch stretch)