dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-16 16:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: do not change original image aspect ratio and do not upscale image in SWIPE mode

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-06-11 10:12:03 +08:00
parent bcefb773c1
commit 7c1a894525
No known key found for this signature in database
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/Views/ImageContainer.cs
View file

@ -137,21 +137,12 @@ namespace SourceGit.Views
var w = Bounds.Width; var w = Bounds.Width;
var h = Bounds.Height; var h = Bounds.Height;
var x = w * alpha; var x = w * alpha;
var left = OldImage;
if (left != null && alpha > 0)
{
var src = new Rect(0, 0, left.Size.Width * alpha, left.Size.Height);
var dst = new Rect(0, 0, x, h);
context.DrawImage(left, src, dst);
}
var right = NewImage; if (OldImage is { } left && alpha > 0)
if (right != null && alpha < 1) RenderSingleSide(context, left, new Rect(0, 0, x, h));
{
var src = new Rect(right.Size.Width * alpha, 0, right.Size.Width * (1 - alpha), right.Size.Height); if (NewImage is { } right && alpha < 1)
var dst = new Rect(x, 0, w - x, h); RenderSingleSide(context, right, new Rect(x, 0, w - x, h));
context.DrawImage(right, src, dst);
}
context.DrawLine(new Pen(Brushes.DarkGreen, 2), new Point(x, 0), new Point(x, Bounds.Height)); context.DrawLine(new Pen(Brushes.DarkGreen, 2), new Point(x, 0), new Point(x, Bounds.Height));
} }
@ -233,6 +224,25 @@ namespace SourceGit.Views
return new Size(scale * img.Width, scale * img.Height); return new Size(scale * img.Width, scale * img.Height);
} }
private void RenderSingleSide(DrawingContext context, Bitmap img, Rect clip)
{
var w = Bounds.Width;
var h = Bounds.Height;
var imgW = img.Size.Width;
var imgH = img.Size.Height;
var scale = Math.Min(1, Math.Min(w / imgW, h / imgH));
var scaledW = img.Size.Width * scale;
var scaledH = img.Size.Height * scale;
var src = new Rect(0, 0, imgW, imgH);
var dst = new Rect((w - scaledW) * 0.5, (h - scaledH) * 0.5, scaledW, scaledH);
using (context.PushClip(clip))
context.DrawImage(img, src, dst);
}
private bool _pressedOnSlider = false; private bool _pressedOnSlider = false;
private bool _lastInSlider = false; private bool _lastInSlider = false;
} }