mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-02 18:26:27 +13:00
Adding freehand drawing support
This commit is contained in:
parent
2497875b0a
commit
84c3a977d6
4 changed files with 132 additions and 0 deletions
|
@ -174,6 +174,7 @@ public enum ShapeType // Localized
|
||||||
DrawingRectangle,
|
DrawingRectangle,
|
||||||
DrawingRoundedRectangle,
|
DrawingRoundedRectangle,
|
||||||
DrawingEllipse,
|
DrawingEllipse,
|
||||||
|
DrawingFreehand,
|
||||||
DrawingLine,
|
DrawingLine,
|
||||||
DrawingArrow,
|
DrawingArrow,
|
||||||
DrawingText,
|
DrawingText,
|
||||||
|
|
126
ShareX.ScreenCaptureLib/Shapes/Drawing/FreehandDrawingShape.cs
Normal file
126
ShareX.ScreenCaptureLib/Shapes/Drawing/FreehandDrawingShape.cs
Normal file
|
@ -0,0 +1,126 @@
|
||||||
|
#region License Information (GPL v3)
|
||||||
|
|
||||||
|
/*
|
||||||
|
ShareX - A program that allows you to take screenshots and share any file type
|
||||||
|
Copyright (c) 2007-2016 ShareX Team
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU General Public License
|
||||||
|
as published by the Free Software Foundation; either version 2
|
||||||
|
of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
|
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#endregion License Information (GPL v3)
|
||||||
|
|
||||||
|
using ShareX.HelpersLib;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Drawing.Drawing2D;
|
||||||
|
|
||||||
|
namespace ShareX.ScreenCaptureLib
|
||||||
|
{
|
||||||
|
public class FreehandDrawingShape : BaseDrawingShape
|
||||||
|
{
|
||||||
|
public override ShapeType ShapeType { get; } = ShapeType.DrawingFreehand;
|
||||||
|
|
||||||
|
public override bool ShowResizeNodes { get; } = false;
|
||||||
|
|
||||||
|
public Point LastPosition
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (points.Count > 0)
|
||||||
|
{
|
||||||
|
return points[points.Count - 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
return Point.Empty;
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (points.Count > 0)
|
||||||
|
{
|
||||||
|
points[points.Count - 1] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Point> points = new List<Point>();
|
||||||
|
private bool isPolygonMode;
|
||||||
|
|
||||||
|
public override bool Intersects(Point position)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnUpdate()
|
||||||
|
{
|
||||||
|
if (Manager.IsCreating)
|
||||||
|
{
|
||||||
|
if (Manager.IsCornerMoving)
|
||||||
|
{
|
||||||
|
Move(InputManager.MouseVelocity);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Point pos = InputManager.MousePosition0Based;
|
||||||
|
|
||||||
|
if (points.Count == 0 || (!Manager.IsProportionalResizing && LastPosition != pos))
|
||||||
|
{
|
||||||
|
points.Add(pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Manager.IsProportionalResizing)
|
||||||
|
{
|
||||||
|
if (!isPolygonMode)
|
||||||
|
{
|
||||||
|
points.Add(pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
LastPosition = pos;
|
||||||
|
}
|
||||||
|
|
||||||
|
isPolygonMode = Manager.IsProportionalResizing;
|
||||||
|
|
||||||
|
Rectangle = points.CreateRectangle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (Manager.IsMoving)
|
||||||
|
{
|
||||||
|
Move(InputManager.MouseVelocity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnDraw(Graphics g)
|
||||||
|
{
|
||||||
|
if (points.Count > 1 && BorderSize > 0 && BorderColor.A > 0)
|
||||||
|
{
|
||||||
|
g.SmoothingMode = SmoothingMode.HighQuality;
|
||||||
|
|
||||||
|
using (Pen pen = new Pen(BorderColor, BorderSize))
|
||||||
|
using (GraphicsPath gp = new GraphicsPath())
|
||||||
|
{
|
||||||
|
for (int i = 0; i < points.Count - 1; i++)
|
||||||
|
{
|
||||||
|
gp.AddLine(points[i], points[i + 1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
g.DrawPath(pen, gp);
|
||||||
|
}
|
||||||
|
|
||||||
|
g.SmoothingMode = SmoothingMode.None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1274,6 +1274,9 @@ private BaseShape CreateShape(ShapeType shapeType)
|
||||||
case ShapeType.DrawingEllipse:
|
case ShapeType.DrawingEllipse:
|
||||||
shape = new EllipseDrawingShape();
|
shape = new EllipseDrawingShape();
|
||||||
break;
|
break;
|
||||||
|
case ShapeType.DrawingFreehand:
|
||||||
|
shape = new FreehandDrawingShape();
|
||||||
|
break;
|
||||||
case ShapeType.DrawingLine:
|
case ShapeType.DrawingLine:
|
||||||
shape = new LineDrawingShape();
|
shape = new LineDrawingShape();
|
||||||
break;
|
break;
|
||||||
|
@ -1381,6 +1384,7 @@ private void CheckHover()
|
||||||
switch (CurrentShapeType)
|
switch (CurrentShapeType)
|
||||||
{
|
{
|
||||||
case ShapeType.RegionFreehand:
|
case ShapeType.RegionFreehand:
|
||||||
|
case ShapeType.DrawingFreehand:
|
||||||
case ShapeType.DrawingLine:
|
case ShapeType.DrawingLine:
|
||||||
case ShapeType.DrawingArrow:
|
case ShapeType.DrawingArrow:
|
||||||
case ShapeType.DrawingStep:
|
case ShapeType.DrawingStep:
|
||||||
|
|
|
@ -92,6 +92,7 @@
|
||||||
<Compile Include="Shapes\BaseShape.cs" />
|
<Compile Include="Shapes\BaseShape.cs" />
|
||||||
<Compile Include="Shapes\Drawing\ArrowDrawingShape.cs" />
|
<Compile Include="Shapes\Drawing\ArrowDrawingShape.cs" />
|
||||||
<Compile Include="Shapes\Drawing\BaseDrawingShape.cs" />
|
<Compile Include="Shapes\Drawing\BaseDrawingShape.cs" />
|
||||||
|
<Compile Include="Shapes\Drawing\FreehandDrawingShape.cs" />
|
||||||
<Compile Include="Shapes\Drawing\StepDrawingShape.cs" />
|
<Compile Include="Shapes\Drawing\StepDrawingShape.cs" />
|
||||||
<Compile Include="Shapes\Region\FreehandRegionShape.cs" />
|
<Compile Include="Shapes\Region\FreehandRegionShape.cs" />
|
||||||
<Compile Include="Shapes\TextDrawingOptions.cs" />
|
<Compile Include="Shapes\TextDrawingOptions.cs" />
|
||||||
|
|
Loading…
Reference in a new issue