[WPF] Fixed pattern rendering issues

2 files changed, 18 insertions, 16 deletions

diff --git a/Xwt.WPF/Xwt.WPFBackend/ImageHandler.cs b/Xwt.WPF/Xwt.WPFBackend/ImageHandler.cs
index 77e19601..40bb64b1 100644
--- a/Xwt.WPF/Xwt.WPFBackend/ImageHandler.cs
+++ b/Xwt.WPF/Xwt.WPFBackend/ImageHandler.cs
@@ -408,7 +408,7 @@ namespace Xwt.WPFBackend
 		public ImageSource GetBestFrame (ApplicationContext actx, double scaleFactor, double width, double height, bool forceExactSize)
 		{
 			var f = FindFrame (width, height, scaleFactor);
-			if (f == null || (forceExactSize && (f.Width != (int)width || f.Height != (int)height)))
+			if (f == null || (forceExactSize && (Math.Abs (f.Width - width * scaleFactor) > 0.01 || Math.Abs (f.Height - height * scaleFactor) > 0.01)))
 				return RenderFrame (actx, scaleFactor, width, height);
 			else
 				return f;
diff --git a/Xwt.WPF/Xwt.WPFBackend/ImagePatternBackendHandler.cs b/Xwt.WPF/Xwt.WPFBackend/ImagePatternBackendHandler.cs
index 8449b193..091e5ff8 100644
--- a/Xwt.WPF/Xwt.WPFBackend/ImagePatternBackendHandler.cs
+++ b/Xwt.WPF/Xwt.WPFBackend/ImagePatternBackendHandler.cs
@@ -58,21 +58,23 @@ namespace Xwt.WPFBackend
 
 		public ImageBrush GetBrush (double scaleFactor)
 		{
-			if (brush == null || scaleFactor != this.scaleFactor) {
-				this.scaleFactor = scaleFactor;
-				var ib = (WpfImage)image.Backend;
-				var bmp = ib.GetBestFrame (actx, scaleFactor, image.Size.Width, image.Size.Height, true);
-				brush = new ImageBrush (bmp) {
-					TileMode = TileMode.Tile,
-					ViewportUnits = BrushMappingMode.Absolute,
-					AlignmentY = System.Windows.Media.AlignmentY.Top,
-					AlignmentX = System.Windows.Media.AlignmentX.Left,
-					Stretch = System.Windows.Media.Stretch.None,
-					Viewport = new System.Windows.Rect (0, 0, image.Size.Width * scaleFactor, image.Size.Height * scaleFactor),
-					Opacity = image.Alpha
-				};
-				brush.RelativeTransform = new ScaleTransform (1d/scaleFactor, 1d/scaleFactor);
-			}
+            if (brush == null || scaleFactor != this.scaleFactor)
+            {
+                this.scaleFactor = scaleFactor;
+                var ib = (WpfImage)image.Backend;
+                var bmp = ib.GetBestFrame(actx, scaleFactor, image.Size.Width, image.Size.Height, false);
+                brush = new ImageBrush(bmp)
+                {
+                    TileMode = TileMode.Tile,
+                    ViewportUnits = BrushMappingMode.Absolute,
+                    AlignmentY = System.Windows.Media.AlignmentY.Top,
+                    AlignmentX = System.Windows.Media.AlignmentX.Left,
+                    Stretch = System.Windows.Media.Stretch.None,
+                    Viewport = new System.Windows.Rect(0, 0, image.Size.Width, image.Size.Height),
+                    Opacity = image.Alpha
+                };
+                brush.RelativeTransform = new ScaleTransform(image.Size.Width / bmp.Width, image.Size.Height / bmp.Height);
+            }
 			return brush;
 		}
 	}