mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 17:56:51 +13:00
Revert "Add tiling support to "Image" image effect"
This reverts commit 5c3d8cb19c
.
This commit is contained in:
parent
5c3d8cb19c
commit
53d1a3b4e0
2 changed files with 9 additions and 21 deletions
|
@ -83,7 +83,7 @@ public DrawImage()
|
||||||
|
|
||||||
public override Bitmap Apply(Bitmap bmp)
|
public override Bitmap Apply(Bitmap bmp)
|
||||||
{
|
{
|
||||||
if (Opacity < 1)
|
if (Opacity < 1 || (SizeMode != DrawImageSizeMode.DontResize && Size.Width <= 0 && Size.Height <= 0))
|
||||||
{
|
{
|
||||||
return bmp;
|
return bmp;
|
||||||
}
|
}
|
||||||
|
@ -98,7 +98,7 @@ public override Bitmap Apply(Bitmap bmp)
|
||||||
{
|
{
|
||||||
Size imageSize;
|
Size imageSize;
|
||||||
|
|
||||||
if (SizeMode == DrawImageSizeMode.AbsoluteSize || SizeMode == DrawImageSizeMode.Tile)
|
if (SizeMode == DrawImageSizeMode.AbsoluteSize)
|
||||||
{
|
{
|
||||||
int width = Size.Width == -1 ? bmp.Width : Size.Width;
|
int width = Size.Width == -1 ? bmp.Width : Size.Width;
|
||||||
int height = Size.Height == -1 ? bmp.Height : Size.Height;
|
int height = Size.Height == -1 ? bmp.Height : Size.Height;
|
||||||
|
@ -135,29 +135,18 @@ public override Bitmap Apply(Bitmap bmp)
|
||||||
g.PixelOffsetMode = PixelOffsetMode.Half;
|
g.PixelOffsetMode = PixelOffsetMode.Half;
|
||||||
g.CompositingMode = CompositingMode;
|
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);
|
ColorMatrix matrix = ColorMatrixManager.Alpha(Opacity / 100f);
|
||||||
g.FillRectangle(brush, imageRectangle);
|
ia.SetColorMatrix(matrix, ColorMatrixFlag.Default, ColorAdjustType.Bitmap);
|
||||||
|
g.DrawImage(bmpWatermark, imageRectangle, 0, 0, bmpWatermark.Width, bmpWatermark.Height, GraphicsUnit.Pixel, ia);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (Opacity < 100)
|
g.DrawImage(bmpWatermark, imageRectangle);
|
||||||
{
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,6 @@ public enum DrawImageSizeMode // Localized
|
||||||
DontResize,
|
DontResize,
|
||||||
AbsoluteSize,
|
AbsoluteSize,
|
||||||
PercentageOfWatermark,
|
PercentageOfWatermark,
|
||||||
PercentageOfCanvas,
|
PercentageOfCanvas
|
||||||
Tile
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue