CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

Differentiate between percentage of canvas, and percentage of watermark, when specifying a relative size.

Browse source
This commit is contained in:
RedMser 2018-02-23 17:35:27 +01:00
parent 6fb2af00a4
commit d7318fe7ca
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ShareX.ImageEffectsLib/Drawings/DrawImage.cs
View file

@ -78,16 +78,21 @@ public override Image Apply(Image img)
{ {
//Calculate size first //Calculate size first
Size imageSize = img2.Size; Size imageSize = img2.Size;
if (SizeMode == DrawImageSizeMode.Absolute) if (SizeMode == DrawImageSizeMode.AbsoluteSize)
{ {
//Use Size property //Use Size property
imageSize = Size; 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))); 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 //Place the image
Point imagePosition = Helpers.GetPosition(Placement, Offset, img.Size, imageSize); Point imagePosition = Helpers.GetPosition(Placement, Offset, img.Size, imageSize);
@ -112,8 +117,9 @@ public override Image Apply(Image img)
public enum DrawImageSizeMode public enum DrawImageSizeMode
{ {
DontResize, DontResize,
Absolute, AbsoluteSize,
Percentage PercentageOfWatermark,
PercentageOfCanvas
} }
} }
} }