CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-01 04:30:49 +12:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CutOutBitmapMiddle

Browse source
This commit is contained in:
Niels Martin Hansen 2022-08-17 16:13:55 +02:00
parent 2465e94206
commit 9de1953e6d
2 changed files with 48 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
ShareX.HelpersLib/Helpers/ImageHelpers.cs
View file

@ -223,124 +223,72 @@ public static Bitmap CropBitmap(Bitmap bmp, Rectangle rect)
return null; return null;
} }
public static Bitmap CutOutBitmapMiddleHorizontal(Bitmap bmp, int x, int width, CutOutEffectType effectType, int effectSize) private static Bitmap ApplyCutOutEffect(Bitmap bmp, AnchorStyles effectEdge, CutOutEffectType effectType, int effectSize)
{ {
if (bmp != null && width > 0) switch (effectType)
{ {
Bitmap leftPart = null, rightPart = null; case CutOutEffectType.None:
if (x > 0) return bmp;
{
leftPart = CropBitmap(bmp, new Rectangle(0, 0, Math.Min(x, bmp.Width), bmp.Height));
switch (effectType)
{
case CutOutEffectType.None:
break;
case CutOutEffectType.ZigZag:
break;
case CutOutEffectType.TornEdge:
leftPart = TornEdges(leftPart, effectSize, effectSize * 2, AnchorStyles.Right, false);
break;
case CutOutEffectType.Wave:
break;
case CutOutEffectType.Gradient:
break;
}
}
if (x + width < bmp.Width)
{
int x2 = Math.Max(x + width, 0);
rightPart = CropBitmap(bmp, new Rectangle(x2, 0, bmp.Width - x2, bmp.Height));
switch (effectType)
{
case CutOutEffectType.None:
break;
case CutOutEffectType.ZigZag:
break;
case CutOutEffectType.TornEdge:
rightPart = TornEdges(rightPart, effectSize, effectSize * 2, AnchorStyles.Left, false);
break;
case CutOutEffectType.Wave:
break;
case CutOutEffectType.Gradient:
break;
}
}
if (leftPart != null && rightPart != null) case CutOutEffectType.ZigZag:
{ return bmp;
return CombineImages(new List<Bitmap> { leftPart, rightPart }, Orientation.Horizontal);
} case CutOutEffectType.TornEdge:
else if (leftPart != null) return TornEdges(bmp, effectSize, effectSize * 2, effectEdge, false);
{
return leftPart; case CutOutEffectType.Wave:
} return bmp;
else if (rightPart != null)
{ case CutOutEffectType.Gradient:
return rightPart; return bmp;
}
} }
return null; throw new NotImplementedException(); // should not be reachable
} }
public static Bitmap CutOutBitmapMiddleVertical(Bitmap bmp, int y, int height, CutOutEffectType effectType, int effectSize) public static Bitmap CutOutBitmapMiddle(Bitmap bmp, Orientation orientation, int start, int size, CutOutEffectType effectType, int effectSize)
{ {
if (bmp != null && height > 0) if (bmp != null && size > 0)
{ {
Bitmap topPart = null, bottomPart = null; Bitmap firstPart = null, secondPart = null;
if (y > 0)
if (start > 0)
{ {
topPart = CropBitmap(bmp, new Rectangle(0, 0, bmp.Width, Math.Min(y, bmp.Height))); Rectangle r = orientation == Orientation.Horizontal
switch (effectType) ? new Rectangle(0, 0, Math.Min(start, bmp.Width), bmp.Height)
{ : new Rectangle(0, 0, bmp.Width, Math.Min(start, bmp.Height));
case CutOutEffectType.None: firstPart = CropBitmap(bmp, r);
break; AnchorStyles effectEdge = orientation == Orientation.Horizontal ? AnchorStyles.Right : AnchorStyles.Bottom;
case CutOutEffectType.ZigZag: firstPart = ApplyCutOutEffect(firstPart, effectEdge, effectType, effectSize);
break;
case CutOutEffectType.TornEdge:
topPart = TornEdges(topPart, effectSize, effectSize * 2, AnchorStyles.Bottom, false);
break;
case CutOutEffectType.Wave:
break;
case CutOutEffectType.Gradient:
break;
}
}
if (y + height < bmp.Height)
{
int y2 = Math.Max(y + height, 0);
bottomPart = CropBitmap(bmp, new Rectangle(0, y2, bmp.Width, bmp.Height - y2));
switch (effectType)
{
case CutOutEffectType.None:
break;
case CutOutEffectType.ZigZag:
break;
case CutOutEffectType.TornEdge:
bottomPart = TornEdges(bottomPart, effectSize, effectSize * 2, AnchorStyles.Top, false);
break;
case CutOutEffectType.Wave:
break;
case CutOutEffectType.Gradient:
break;
}
} }
if (topPart != null && bottomPart != null) int cutDimension = orientation == Orientation.Horizontal ? bmp.Width : bmp.Height;
if (start + size < cutDimension)
{ {
return CombineImages(new List<Bitmap> { topPart, bottomPart }, Orientation.Vertical); int end = Math.Max(start + size, 0);
Rectangle r = orientation == Orientation.Horizontal
? new Rectangle(end, 0, bmp.Width - end, bmp.Height)
: new Rectangle(0, end, bmp.Width, bmp.Height - end);
secondPart = CropBitmap(bmp, r);
AnchorStyles effectEdge = orientation == Orientation.Horizontal ? AnchorStyles.Left : AnchorStyles.Top;
secondPart = ApplyCutOutEffect(secondPart, effectEdge, effectType, effectSize);
} }
else if (topPart != null)
if (firstPart != null && secondPart != null)
{ {
return topPart; return CombineImages(new List<Bitmap> { firstPart, secondPart }, orientation);
} }
else if (bottomPart != null) else if (firstPart != null)
{ {
return bottomPart; return firstPart;
}
else if (secondPart != null)
{
return secondPart;
} }
} }
return null; return bmp;
} }
/// <summary>Automatically crop image to remove transparent outside area.</summary> /// <summary>Automatically crop image to remove transparent outside area.</summary>

4
ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
View file

@ -1929,12 +1929,12 @@ public void CutOut(RectangleF rect)
if (isHorizontal && cropRect.Width > 0) if (isHorizontal && cropRect.Width > 0)
{ {
CollapseAllHorizontal(rect.X, rect.Width); CollapseAllHorizontal(rect.X, rect.Width);
UpdateCanvas(ImageHelpers.CutOutBitmapMiddleHorizontal(Form.Canvas, cropRect.X, cropRect.Width, CutOutEffectType.TornEdge, 5)); UpdateCanvas(ImageHelpers.CutOutBitmapMiddle(Form.Canvas, Orientation.Horizontal, cropRect.X, cropRect.Width, CutOutEffectType.TornEdge, 5));
} }
else if (!isHorizontal && cropRect.Height > 0) else if (!isHorizontal && cropRect.Height > 0)
{ {
CollapseAllVertical(rect.Y, rect.Height); CollapseAllVertical(rect.Y, rect.Height);
UpdateCanvas(ImageHelpers.CutOutBitmapMiddleVertical(Form.Canvas, cropRect.Y, cropRect.Height, CutOutEffectType.TornEdge, 5)); UpdateCanvas(ImageHelpers.CutOutBitmapMiddle(Form.Canvas, Orientation.Vertical, cropRect.Y, cropRect.Height, CutOutEffectType.TornEdge, 5));
} }
} }