Merge pull request #3165 from RedMser/master

[UPDATE] SizeMode relative values
This commit is contained in:
Jaex 2018-02-23 19:39:19 +03:00 committed by GitHub
commit 857e3b356d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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
}
}
}