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

Implement collapsing shapes overlapping with cut out area

Browse source
This commit is contained in:
Niels Martin Hansen 2022-08-16 23:25:20 +02:00
parent 8b0c5d0d66
commit 32cae726e8
1 changed files with 104 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1625,12 +1625,110 @@ public void MoveAll(PointF offset)
public void CollapseAllHorizontal(float x, float width)
{
// todo
float x2 = x + width;
if (width <= 0) return;
List<BaseShape> toDelete = new List<BaseShape>();
foreach (BaseShape shape in Shapes)
{
RectangleF sr = shape.Rectangle;
if (sr.Left < x)
{
if (sr.Right <= x)
{
// case 1: entirely before the cut, no action needed
}
else if (sr.Right < x2)
{
// case 2: end reaches into the cut, shorten shape to end at x
shape.Rectangle = new RectangleF(sr.X, sr.Y, x - sr.X, sr.Height);
}
else
{
// case 3: end reaches over the cut, shorten shape by width, keeping left
shape.Rectangle = new RectangleF(sr.X, sr.Y, sr.Width - width, sr.Height);
}
}
else if (sr.Left < x2)
{
if (sr.Right <= x2)
{
// case 4: entirely inside the cut, delete the shape
toDelete.Add(shape);
}
else
{
// case 5: beginning reaches into the cut, shorten shape by difference between shape left and x2
shape.Rectangle = new RectangleF(x, sr.Y, sr.Right - x2, sr.Height);
}
}
else
{
// case 6: entirely after the cut, offset shape by width
shape.Rectangle = new RectangleF(sr.X - width, sr.Y, sr.Width, sr.Height);
}
}
foreach (BaseShape shape in toDelete)
{
shape.Dispose();
Shapes.Remove(shape);
}
}
public void CollapseAllVertical(float y, float height)
{
// todo
float y2 = y + height;
if (height <= 0) return;
List<BaseShape> toDelete = new List<BaseShape>();
foreach (BaseShape shape in Shapes)
{
RectangleF sr = shape.Rectangle;
if (sr.Top < y)
{
if (sr.Bottom <= y)
{
// case 1: entirely before the cut, no action needed
}
else if (sr.Bottom < y2)
{
// case 2: end reaches into the cut, shorten shape to end at x
shape.Rectangle = new RectangleF(sr.X, sr.Y, sr.Width, y - sr.Y);
}
else
{
// case 3: end reaches over the cut, shorten shape by width, keeping left
shape.Rectangle = new RectangleF(sr.X, sr.Y, sr.Width, sr.Height - height);
}
}
else if (sr.Top < y2)
{
if (sr.Bottom <= y2)
{
// case 4: entirely inside the cut, delete the shape
toDelete.Add(shape);
}
else
{
// case 5: beginning reaches into the cut, shorten shape by difference between shape left and x2
shape.Rectangle = new RectangleF(sr.X, y, sr.Width, sr.Bottom - y2);
}
}
else
{
// case 6: entirely after the cut, offset shape by width
shape.Rectangle = new RectangleF(sr.X, sr.Y - height, sr.Width, sr.Height);
}
}
foreach (BaseShape shape in toDelete)
{
shape.Dispose();
Shapes.Remove(shape);
}
}
public void RemoveOutsideShapes()
@ -1824,11 +1922,11 @@ public void CutOut(RectangleF rect)
{
bool isHorizontal = rect.Width > rect.Height;
rect = CaptureHelpers.ScreenToClient(rect.Round());
RectangleF adjustedRect = CaptureHelpers.ScreenToClient(rect.Round());
PointF offset = CaptureHelpers.ScreenToClient(Form.CanvasRectangle.Location.Round());
rect.X -= offset.X;
rect.Y -= offset.Y;
Rectangle cropRect = Rectangle.Intersect(new Rectangle(0, 0, Form.Canvas.Width, Form.Canvas.Height), rect.Round());
adjustedRect.X -= offset.X;
adjustedRect.Y -= offset.Y;
Rectangle cropRect = Rectangle.Intersect(new Rectangle(0, 0, Form.Canvas.Width, Form.Canvas.Height), adjustedRect.Round());
if (isHorizontal && cropRect.Width > 0)
{