CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Only allow selection and moving shapes if current shape is same as selected shape that way you can do region capture top of drawings without select drawing shape

Browse source
This commit is contained in:
Jaex 2016-05-03 14:06:15 +03:00
parent a568e98617
commit 09fdffc32d
9 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs
View file

@ -440,7 +440,7 @@ private void RegionSelection(Point location)
PositionOnClick = InputManager.MousePosition0Based;
if (shape != null) // Select area
if (shape != null && shape.ShapeType == CurrentShapeType) // Select area
{
IsMoving = true;
CurrentShape = shape;

2
ShareX.ScreenCaptureLib/Shapes/BaseShape.cs
View file

@ -31,6 +31,8 @@ namespace ShareX.ScreenCaptureLib
{
public abstract class BaseShape
{
public abstract ShapeType ShapeType { get; }
public Rectangle Rectangle { get; set; }
public BaseShape()

2
ShareX.ScreenCaptureLib/Shapes/Drawing/RectangleDrawingShape.cs
View file

@ -34,6 +34,8 @@ namespace ShareX.ScreenCaptureLib
{
public class RectangleDrawingShape : BaseDrawingShape
{
public override ShapeType ShapeType { get; } = ShapeType.DrawingRectangle;
public override void Draw(Graphics g)
{
if (FillColor != Color.Transparent)

2
ShareX.ScreenCaptureLib/Shapes/Drawing/RoundedRectangleDrawingShape.cs
View file

@ -34,6 +34,8 @@ namespace ShareX.ScreenCaptureLib
{
public class RoundedRectangleDrawingShape : BaseDrawingShape
{
public override ShapeType ShapeType { get; } = ShapeType.DrawingRoundedRectangle;
public float Radius { get; set; }
public override void Draw(Graphics g)

2
ShareX.ScreenCaptureLib/Shapes/Region/DiamondRegionShape.cs
View file

@ -35,6 +35,8 @@ namespace ShareX.ScreenCaptureLib
{
public class DiamondRegionShape : BaseRegionShape
{
public override ShapeType ShapeType { get; } = ShapeType.RegionDiamond;
public override void AddShapePath(GraphicsPath gp, Rectangle rect)
{
gp.AddDiamond(rect);

2
ShareX.ScreenCaptureLib/Shapes/Region/EllipseRegionShape.cs
View file

@ -34,6 +34,8 @@ namespace ShareX.ScreenCaptureLib
{
public class EllipseRegionShape : BaseRegionShape
{
public override ShapeType ShapeType { get; } = ShapeType.RegionEllipse;
public override void AddShapePath(GraphicsPath gp, Rectangle rect)
{
gp.AddEllipse(rect);

2
ShareX.ScreenCaptureLib/Shapes/Region/RectangleRegionShape.cs
View file

@ -34,6 +34,8 @@ namespace ShareX.ScreenCaptureLib
{
public class RectangleRegionShape : BaseRegionShape
{
public override ShapeType ShapeType { get; } = ShapeType.RegionRectangle;
public override void AddShapePath(GraphicsPath gp, Rectangle rect)
{
gp.AddRectangle(rect);

2
ShareX.ScreenCaptureLib/Shapes/Region/RoundedRectangleRegionShape.cs
View file

@ -35,6 +35,8 @@ namespace ShareX.ScreenCaptureLib
{
public class RoundedRectangleRegionShape : BaseRegionShape
{
public override ShapeType ShapeType { get; } = ShapeType.RegionRoundedRectangle;
public float Radius { get; set; }
public override void AddShapePath(GraphicsPath gp, Rectangle rect)

2
ShareX.ScreenCaptureLib/Shapes/Region/TriangleRegionShape.cs
View file

@ -35,6 +35,8 @@ namespace ShareX.ScreenCaptureLib
{
public class TriangleRegionShape : BaseRegionShape
{
public override ShapeType ShapeType { get; } = ShapeType.RegionTriangle;
public TriangleAngle Angle { get; set; }
public override void AddShapePath(GraphicsPath gp, Rectangle rect)