From 0ae2576c609815e01460cc38db344fb0651a2c22 Mon Sep 17 00:00:00 2001 From: noctwolf Date: Sat, 20 Jul 2019 17:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E4=B8=8D=E6=98=AF100%=E6=97=B6=E5=87=BA=E9=94=99?= =?UTF-8?q?=EF=BC=8C=E6=AF=94=E5=A6=82125%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandyControl_Shared/Controls/Image/ImageBlock.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs index 9b9b37b1..de696209 100644 --- a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs +++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs @@ -154,23 +154,24 @@ namespace HandyControl.Controls if (Source != null && Source is BitmapSource source) { // ReSharper disable once AssignNullToNotNullAttribute - var croppedBitmap = new CroppedBitmap(source, CalDisplayRect()); + var croppedBitmap = new CroppedBitmap(source, + CalDisplayRect(source.PixelWidth / Columns, source.PixelHeight / Rows)); dc.DrawImage(croppedBitmap, new Rect(0, 0, RenderSize.Width, RenderSize.Height)); } } - private Int32Rect CalDisplayRect() + private Int32Rect CalDisplayRect(int width, int height) { if (_currentIndex > _indexMax) { _currentIndex = _indexMin; } - var x = (int) (_currentIndex % Columns * RenderSize.Width); + var x = _currentIndex % Columns * width; // ReSharper disable once PossibleLossOfFraction - var y = (int) (_currentIndex / Columns * RenderSize.Height); + var y = _currentIndex / Columns * height; - var rect = new Int32Rect(x, y, (int)RenderSize.Width, (int)RenderSize.Height); + var rect = new Int32Rect(x, y, width, height); _currentIndex++; return rect; }