CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 11:10:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add tiling support to "Image" image effect"

Browse source 
This reverts commit 5c3d8cb19c.
This commit is contained in:
Jaex 2020-11-15 18:44:37 +03:00
parent 5c3d8cb19c
commit 53d1a3b4e0
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ public DrawImage()
public override Bitmap Apply(Bitmap bmp)
{
if (Opacity < 1)
if (Opacity < 1 || (SizeMode != DrawImageSizeMode.DontResize && Size.Width <= 0 && Size.Height <= 0))
{
return bmp;
}
@ -98,7 +98,7 @@ public override Bitmap Apply(Bitmap bmp)
{
Size imageSize;
if (SizeMode == DrawImageSizeMode.AbsoluteSize || SizeMode == DrawImageSizeMode.Tile)
if (SizeMode == DrawImageSizeMode.AbsoluteSize)
{
int width = Size.Width == -1 ? bmp.Width : Size.Width;
int height = Size.Height == -1 ? bmp.Height : Size.Height;
@ -135,29 +135,18 @@ public override Bitmap Apply(Bitmap bmp)
g.PixelOffsetMode = PixelOffsetMode.Half;
g.CompositingMode = CompositingMode;
if (SizeMode == DrawImageSizeMode.Tile)
if (Opacity < 100)
{
using (TextureBrush brush = new TextureBrush(bmpWatermark, WrapMode.Tile))
using (ImageAttributes ia = new ImageAttributes())
{
brush.TranslateTransform(imageRectangle.X, imageRectangle.Y);
g.FillRectangle(brush, imageRectangle);
ColorMatrix matrix = ColorMatrixManager.Alpha(Opacity / 100f);
ia.SetColorMatrix(matrix, ColorMatrixFlag.Default, ColorAdjustType.Bitmap);
g.DrawImage(bmpWatermark, imageRectangle, 0, 0, bmpWatermark.Width, bmpWatermark.Height, GraphicsUnit.Pixel, ia);
}
}
else
{
if (Opacity < 100)
{
using (ImageAttributes ia = new ImageAttributes())
{
ColorMatrix matrix = ColorMatrixManager.Alpha(Opacity / 100f);
ia.SetColorMatrix(matrix, ColorMatrixFlag.Default, ColorAdjustType.Bitmap);
g.DrawImage(bmpWatermark, imageRectangle, 0, 0, bmpWatermark.Width, bmpWatermark.Height, GraphicsUnit.Pixel, ia);
}
}
else
{
g.DrawImage(bmpWatermark, imageRectangle);
}
g.DrawImage(bmpWatermark, imageRectangle);
}
}
}

3
ShareX.ImageEffectsLib/Enums.cs
View file

@ -48,7 +48,6 @@ public enum DrawImageSizeMode // Localized
DontResize,
AbsoluteSize,
PercentageOfWatermark,
PercentageOfCanvas,
Tile
PercentageOfCanvas
}
}