Merge pull request #249 from bijington/feature/fix-padding-factor

Image padding corrections
dansiegel · Jun 27, 2021 · f9c2196 · f9c2196
2 parents d16e615 + 031ca2e
commit f9c2196
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/src/Mobile.BuildTools/Generators/Images/ImageResizeGenerator.cs b/src/Mobile.BuildTools/Generators/Images/ImageResizeGenerator.cs
@@ -93,27 +93,26 @@ private SKBitmap ApplyPadding(OutputImage outputImage, ImageBase image, Context
                 return outputBitmap;
             }
 
-            var paddedBitmap = new SKBitmap(context.Size.Width, context.Size.Height);
-            using var paddedCanvas = new SKCanvas(paddedBitmap);
-
             var paddedContext = CreateContext(
                 GetBackgroundColor(outputImage.PaddingColor, outputImage.RequiresBackgroundColor && image.HasTransparentBackground),
                 Log,
                 1.0,
                 outputImage.PaddingFactor.Value,
                 0,
                 0,
-                context.Size);
+                context.Size);
+
+            // Build the final canvas including the padding.
+            var paddedBitmap = new SKBitmap(paddedContext.Size.Width, paddedContext.Size.Height);
+            using var paddedCanvas = new SKCanvas(paddedBitmap);
 
             paddedCanvas.Clear(paddedContext.BackgroundColor);
             paddedCanvas.Save();
 
-            using var resizedBitmap = outputBitmap.Resize(new SKImageInfo(paddedContext.Size.Width, paddedContext.Size.Height), SKFilterQuality.High);
-
             paddedCanvas.DrawBitmap(
-                resizedBitmap,
-                (context.Size.Width - paddedContext.Size.Width) / 2,
-                (context.Size.Height - paddedContext.Size.Height) / 2);
+                outputBitmap,
+                (paddedContext.Size.Width - context.Size.Width) / 2,
+                (paddedContext.Size.Height - context.Size.Height) / 2);
 
             return paddedBitmap;
         }
@@ -163,4 +162,4 @@ private static Context CreateContext(SKColor backgroundColor, Logging.ILog log,
                 (float)height / currentSize.Height);
         }
     }
-}
+}
diff --git a/tests/Mobile.BuildTools.Tests/Fixtures/Generators/ImageResizerGeneratorFixture.cs b/tests/Mobile.BuildTools.Tests/Fixtures/Generators/ImageResizerGeneratorFixture.cs
@@ -222,25 +222,29 @@ public void AppliesTextBanner(string text, double scale, WatermarkPosition posit
         }
 
         [Theory]
+        [InlineData("dotnetbot.png", 1.5)]
         [InlineData("dotnetbot.png", 1)]
-        [InlineData("dotnetbot.png", .75)]
         [InlineData("dotnetbot.png", .5)]
+        [InlineData("dotnetbot.svg", 1.5)]
         [InlineData("dotnetbot.svg", 1)]
-        [InlineData("dotnetbot.svg", .75)]
-        [InlineData("dotnetbot.svg", .5)]
+        [InlineData("dotnetbot.svg", .5)]
+        [InlineData("logo.svg", 1.5)]
+        [InlineData("logo.svg", 1)]
         public void AppliesPadding(string inputFile, double paddingFactor)
         {
             var config = GetConfiguration();
             config.IntermediateOutputPath += GetOutputDirectorySuffix((nameof(paddingFactor), paddingFactor), (nameof(inputFile), inputFile));
-            var generator = new ImageResizeGenerator(config);
+            var generator = new ImageResizeGenerator(config);
+
+            var outputFilename = $"{Path.GetFileNameWithoutExtension(inputFile)}.png";
 
             var image = new OutputImage
             {
                 Height = 0,
                 Width = 0,
                 InputFile = Path.Combine(TestConstants.ImageDirectory, inputFile),
-                OutputFile = Path.Combine(config.IntermediateOutputPath, "dotnetbot.png"),
-                OutputLink = Path.Combine("Resources", "drawable-xxxhdpi", "dotnetbot.png"),
+                OutputFile = Path.Combine(config.IntermediateOutputPath, outputFilename),
+                OutputLink = Path.Combine("Resources", "drawable-xxxhdpi", outputFilename),
                 RequiresBackgroundColor = false,
                 Scale = 1.0,
                 ShouldBeVisible = true,

diff --git a/...Padding--with-paddingFactor-of-0.5-and-inputFile-of-dotnetbot.png/dotnetbot.png b/...Padding--with-paddingFactor-of-0.5-and-inputFile-of-dotnetbot.png/dotnetbot.png
diff --git a/...Padding--with-paddingFactor-of-0.5-and-inputFile-of-dotnetbot.svg/dotnetbot.png b/...Padding--with-paddingFactor-of-0.5-and-inputFile-of-dotnetbot.svg/dotnetbot.png
diff --git a/...adding--with-paddingFactor-of-0.75-and-inputFile-of-dotnetbot.png/dotnetbot.png b/...adding--with-paddingFactor-of-0.75-and-inputFile-of-dotnetbot.png/dotnetbot.png
diff --git a/...adding--with-paddingFactor-of-0.75-and-inputFile-of-dotnetbot.svg/dotnetbot.png b/...adding--with-paddingFactor-of-0.75-and-inputFile-of-dotnetbot.svg/dotnetbot.png
diff --git a/...ture/AppliesPadding--with-paddingFactor-of-1-and-inputFile-of-logo.svg/logo.png b/...ture/AppliesPadding--with-paddingFactor-of-1-and-inputFile-of-logo.svg/logo.png
diff --git a/...Padding--with-paddingFactor-of-1.5-and-inputFile-of-dotnetbot.png/dotnetbot.png b/...Padding--with-paddingFactor-of-1.5-and-inputFile-of-dotnetbot.png/dotnetbot.png
diff --git a/...Padding--with-paddingFactor-of-1.5-and-inputFile-of-dotnetbot.svg/dotnetbot.png b/...Padding--with-paddingFactor-of-1.5-and-inputFile-of-dotnetbot.svg/dotnetbot.png
diff --git a/...re/AppliesPadding--with-paddingFactor-of-1.5-and-inputFile-of-logo.svg/logo.png b/...re/AppliesPadding--with-paddingFactor-of-1.5-and-inputFile-of-logo.svg/logo.png