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

feat: use bounds instead of width.

Browse Source
This commit is contained in:
rabbitism
2023-08-05 00:13:59 +08:00
parent fbede4004b
commit 480f66014b
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ public class ImageViewer: TemplatedControl
private Image? _image = null!; private Image? _image = null!;
private VisualLayerManager? _layer; private VisualLayerManager? _layer;
private Point? _lastClickPoint; private Point? _lastClickPoint;
private Point? _lastlocation; private Point? _lastLocation;
private bool _moving; private bool _moving;
public static readonly StyledProperty<Control?> OverlayerProperty = AvaloniaProperty.Register<ImageViewer, Control?>( public static readonly StyledProperty<Control?> OverlayerProperty = AvaloniaProperty.Register<ImageViewer, Control?>(
@@ -114,13 +114,13 @@ public class ImageViewer: TemplatedControl
{ {
if (_moving) return; if (_moving) return;
var newValue = args.GetNewValue<double>(); var newValue = args.GetNewValue<double>();
if (_lastlocation is not null) if (_lastLocation is not null)
{ {
_lastlocation = _lastlocation.Value.WithY(newValue); _lastLocation = _lastLocation.Value.WithY(newValue);
} }
else else
{ {
_lastlocation = new Point(0, newValue); _lastLocation = new Point(0, newValue);
} }
} }
@@ -128,13 +128,13 @@ public class ImageViewer: TemplatedControl
{ {
if (_moving) return; if (_moving) return;
var newValue = args.GetNewValue<double>(); var newValue = args.GetNewValue<double>();
if (_lastlocation is not null) if (_lastLocation is not null)
{ {
_lastlocation = _lastlocation.Value.WithX(newValue); _lastLocation = _lastLocation.Value.WithX(newValue);
} }
else else
{ {
_lastlocation = new Point(newValue, 0); _lastLocation = new Point(newValue, 0);
} }
} }
@@ -151,8 +151,8 @@ public class ImageViewer: TemplatedControl
{ {
IImage image = args.GetNewValue<IImage>(); IImage image = args.GetNewValue<IImage>();
Size size = image.Size; Size size = image.Size;
double width = this.Width; double width = this.Bounds.Width;
double height = this.Height; double height = this.Bounds.Height;
if (_image is not null) if (_image is not null)
{ {
_image.Width = size.Width; _image.Width = size.Width;
@@ -187,8 +187,8 @@ public class ImageViewer: TemplatedControl
if (Source is { } i) if (Source is { } i)
{ {
Size size = i.Size; Size size = i.Size;
double width = this.Width; double width = Bounds.Width;
double height = this.Height; double height = Bounds.Height;
_image.Width = size.Width; _image.Width = size.Width;
_image.Height = size.Height; _image.Height = size.Height;
Scale = GetScaleRatio(width/size.Width, height/size.Height, this.Stretch); Scale = GetScaleRatio(width/size.Width, height/size.Height, this.Stretch);
@@ -226,8 +226,8 @@ public class ImageViewer: TemplatedControl
Point p = e.GetPosition(this); Point p = e.GetPosition(this);
double deltaX = p.X - _lastClickPoint.Value.X; double deltaX = p.X - _lastClickPoint.Value.X;
double deltaY = p.Y - _lastClickPoint.Value.Y; double deltaY = p.Y - _lastClickPoint.Value.Y;
TranslateX = deltaX + (_lastlocation?.X ?? 0); TranslateX = deltaX + (_lastLocation?.X ?? 0);
TranslateY = deltaY + (_lastlocation?.Y ?? 0); TranslateY = deltaY + (_lastLocation?.Y ?? 0);
} }
} }
@@ -243,7 +243,7 @@ public class ImageViewer: TemplatedControl
{ {
base.OnPointerReleased(e); base.OnPointerReleased(e);
e.Pointer.Capture(null); e.Pointer.Capture(null);
_lastlocation = new Point(TranslateX, TranslateY); _lastLocation = new Point(TranslateX, TranslateY);
PseudoClasses.Set(PC_Moving, false); PseudoClasses.Set(PC_Moving, false);
_moving = false; _moving = false;
} }