From 6fb2af00a49c07769e7cf99b4c2c4e2109260265 Mon Sep 17 00:00:00 2001 From: RedMser Date: Fri, 23 Feb 2018 17:21:24 +0100 Subject: [PATCH] Watermark SizeMode uses custom enum for clearer value names. Added description to property, too. --- 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 8d9628fe9..0d01f170a 100644 --- a/ShareX.ImageEffectsLib/Drawings/DrawImage.cs +++ b/ShareX.ImageEffectsLib/Drawings/DrawImage.cs @@ -59,9 +59,8 @@ public Point Offset [DefaultValue(""), Editor(typeof(ImageFileNameEditor), typeof(UITypeEditor))] public string ImageLocation { get; set; } - //TODO: Is a custom enum for different watermark image sizes a better idea? - [DefaultValue(SizeType.AutoSize)] - public SizeType SizeMode { get; set; } + [DefaultValue(DrawImageSizeMode.DontResize), Description("How the image watermark should be rescaled, if at all.")] + public DrawImageSizeMode SizeMode { get; set; } [DefaultValue(typeof(Size), "0, 0")] public Size Size { get; set; } @@ -79,12 +78,12 @@ public override Image Apply(Image img) { //Calculate size first Size imageSize = img2.Size; - if (SizeMode == SizeType.Absolute) + if (SizeMode == DrawImageSizeMode.Absolute) { //Use Size property imageSize = Size; } - else if (SizeMode == SizeType.Percent) + else if (SizeMode == DrawImageSizeMode.Percentage) { //Relative size imageSize = new Size((int)(img2.Width * (Size.Width / 100.0)), (int)(img2.Height * (Size.Height / 100.0))); @@ -109,5 +108,12 @@ public override Image Apply(Image img) return img; } + + public enum DrawImageSizeMode + { + DontResize, + Absolute, + Percentage + } } } \ No newline at end of file