From d7318fe7caed25fd9a32528e31da3fcb8ed69fa0 Mon Sep 17 00:00:00 2001 From: RedMser Date: Fri, 23 Feb 2018 17:35:27 +0100 Subject: [PATCH] Differentiate between percentage of canvas, and percentage of watermark, when specifying a relative size. --- ShareX.ImageEffectsLib/Drawings/DrawImage.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ShareX.ImageEffectsLib/Drawings/DrawImage.cs b/ShareX.ImageEffectsLib/Drawings/DrawImage.cs index 0d01f170a..e6bda06dd 100644 --- a/ShareX.ImageEffectsLib/Drawings/DrawImage.cs +++ b/ShareX.ImageEffectsLib/Drawings/DrawImage.cs @@ -78,16 +78,21 @@ public override Image Apply(Image img) { //Calculate size first Size imageSize = img2.Size; - if (SizeMode == DrawImageSizeMode.Absolute) + if (SizeMode == DrawImageSizeMode.AbsoluteSize) { //Use Size property imageSize = Size; } - else if (SizeMode == DrawImageSizeMode.Percentage) + else if (SizeMode == DrawImageSizeMode.PercentageOfWatermark) { - //Relative size + //Relative size (percentage of watermark) imageSize = new Size((int)(img2.Width * (Size.Width / 100.0)), (int)(img2.Height * (Size.Height / 100.0))); } + else if (SizeMode == DrawImageSizeMode.PercentageOfCanvas) + { + //Relative size (percentage of image) + imageSize = new Size((int)(img.Width * (Size.Width / 100.0)), (int)(img.Height * (Size.Height / 100.0))); + } //Place the image Point imagePosition = Helpers.GetPosition(Placement, Offset, img.Size, imageSize); @@ -112,8 +117,9 @@ public override Image Apply(Image img) public enum DrawImageSizeMode { DontResize, - Absolute, - Percentage + AbsoluteSize, + PercentageOfWatermark, + PercentageOfCanvas } } } \ No newline at end of file