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

Added shape category

Browse source
This commit is contained in:
Jaex 2016-09-02 10:09:24 +03:00
parent e3232dee70
commit d3271e597b
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ShareX.ScreenCaptureLib/Enums.cs
View file

@ -166,6 +166,13 @@ public enum RegionCaptureAction // Localized
CaptureActiveMonitor
}
public enum ShapeCategory
{
Region,
Drawing,
Effect
}
public enum ShapeType // Localized
{
RegionRectangle,

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

@ -35,6 +35,8 @@ public abstract class BaseShape : IDisposable
{
protected const int MinimumSize = 3;
public abstract ShapeCategory ShapeCategory { get; }
public abstract ShapeType ShapeType { get; }
public Rectangle Rectangle { get; set; }
@ -73,8 +75,6 @@ public Point EndPosition
public virtual bool IsValidShape => !Rectangle.IsEmpty && Rectangle.Width >= MinimumSize && Rectangle.Height >= MinimumSize;
public virtual bool IsRegionShape { get; } = false;
internal ShapeManager Manager { get; set; }
protected RegionCaptureOptions Options => Manager.Config;
@ -136,7 +136,7 @@ public virtual void OnCreating()
{
Point pos = InputManager.MousePosition0Based;
if (Options.IsFixedSize && IsRegionShape)
if (Options.IsFixedSize && ShapeCategory == ShapeCategory.Region)
{
Manager.IsMoving = true;
Rectangle = new Rectangle(new Point(pos.X - Options.FixedSize.Width / 2, pos.Y - Options.FixedSize.Height / 2), Options.FixedSize);

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

@ -29,6 +29,8 @@ namespace ShareX.ScreenCaptureLib
{
public abstract class BaseDrawingShape : BaseShape
{
public override ShapeCategory ShapeCategory { get; } = ShapeCategory.Drawing;
public Color BorderColor { get; set; }
public int BorderSize { get; set; }
public Color FillColor { get; set; }

2
ShareX.ScreenCaptureLib/Shapes/Effect/BaseEffectShape.cs
View file

@ -29,6 +29,8 @@ namespace ShareX.ScreenCaptureLib
{
public abstract class BaseEffectShape : BaseShape
{
public override ShapeCategory ShapeCategory { get; } = ShapeCategory.Effect;
public abstract void OnDraw(Graphics g);
public virtual void OnDrawFinal(Graphics g, Bitmap bmp)

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

@ -27,6 +27,6 @@ namespace ShareX.ScreenCaptureLib
{
public abstract class BaseRegionShape : BaseShape
{
public override bool IsRegionShape { get; } = true;
public override ShapeCategory ShapeCategory { get; } = ShapeCategory.Region;
}
}