diff --git a/ShareX.HelpersLib/Helpers/ImageHelpers.cs b/ShareX.HelpersLib/Helpers/ImageHelpers.cs index abe8dc17e..f82fc256d 100644 --- a/ShareX.HelpersLib/Helpers/ImageHelpers.cs +++ b/ShareX.HelpersLib/Helpers/ImageHelpers.cs @@ -223,7 +223,7 @@ public static Bitmap CropBitmap(Bitmap bmp, Rectangle rect) return null; } - public static Bitmap TrimBitmapInteriorHorizontal(Bitmap bmp, int x, int width) + public static Bitmap CutOutBitmapMiddleHorizontal(Bitmap bmp, int x, int width) { if (bmp != null && width > 0) { @@ -255,7 +255,7 @@ public static Bitmap TrimBitmapInteriorHorizontal(Bitmap bmp, int x, int width) return null; } - public static Bitmap TrimBitmapInteriorVertical(Bitmap bmp, int y, int height) + public static Bitmap CutOutBitmapMiddleVertical(Bitmap bmp, int y, int height) { if (bmp != null && height > 0) { diff --git a/ShareX.ScreenCaptureLib/Enums.cs b/ShareX.ScreenCaptureLib/Enums.cs index 501c2352e..710295771 100644 --- a/ShareX.ScreenCaptureLib/Enums.cs +++ b/ShareX.ScreenCaptureLib/Enums.cs @@ -292,7 +292,7 @@ public enum ShapeType // Localized EffectPixelate, EffectHighlight, ToolCrop, - ToolTrimInterior + ToolCutOut } public enum ScrollingCaptureScrollMethod // Localized diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs index bc7bc7d05..293d75d3a 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs @@ -1195,8 +1195,8 @@ private BaseShape CreateShape(ShapeType shapeType) case ShapeType.ToolCrop: shape = new CropTool(); break; - case ShapeType.ToolTrimInterior: - shape = new TrimInteriorTool(); + case ShapeType.ToolCutOut: + shape = new CutOutTool(); break; } @@ -1820,7 +1820,7 @@ public Bitmap CropImage(RectangleF rect, bool onlyIfSizeDifferent = false) return null; } - public void TrimInterior(RectangleF rect) + public void CutOut(RectangleF rect) { bool isHorizontal = rect.Width > rect.Height; @@ -1833,12 +1833,12 @@ public void TrimInterior(RectangleF rect) if (isHorizontal && cropRect.Width > 0) { CollapseAllHorizontal(rect.X, rect.Width); - UpdateCanvas(ImageHelpers.TrimBitmapInteriorHorizontal(Form.Canvas, cropRect.X, cropRect.Width)); + UpdateCanvas(ImageHelpers.CutOutBitmapMiddleHorizontal(Form.Canvas, cropRect.X, cropRect.Width)); } else if (!isHorizontal && cropRect.Height > 0) { CollapseAllVertical(rect.Y, rect.Height); - UpdateCanvas(ImageHelpers.TrimBitmapInteriorVertical(Form.Canvas, cropRect.Y, cropRect.Height)); + UpdateCanvas(ImageHelpers.CutOutBitmapMiddleVertical(Form.Canvas, cropRect.Y, cropRect.Height)); } } diff --git a/ShareX.ScreenCaptureLib/Shapes/Tool/TrimInteriorTool.cs b/ShareX.ScreenCaptureLib/Shapes/Tool/CutOutTool.cs similarity index 98% rename from ShareX.ScreenCaptureLib/Shapes/Tool/TrimInteriorTool.cs rename to ShareX.ScreenCaptureLib/Shapes/Tool/CutOutTool.cs index fcebc6a16..b4bbbeffd 100644 --- a/ShareX.ScreenCaptureLib/Shapes/Tool/TrimInteriorTool.cs +++ b/ShareX.ScreenCaptureLib/Shapes/Tool/CutOutTool.cs @@ -29,9 +29,9 @@ namespace ShareX.ScreenCaptureLib { - public class TrimInteriorTool : BaseTool + public class CutOutTool : BaseTool { - public override ShapeType ShapeType { get; } = ShapeType.ToolTrimInterior; + public override ShapeType ShapeType { get; } = ShapeType.ToolCutOut; public override bool LimitRectangleToInsideCanvas { get; } = true; @@ -112,7 +112,7 @@ public override void OnCreated() private void ConfirmButton_MousePressed(object sender, MouseEventArgs e) { - Manager.TrimInterior(Rectangle); + Manager.CutOut(Rectangle); Remove(); } diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj index f3c05b926..26ef6e832 100644 --- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj +++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj @@ -226,7 +226,7 @@ - +