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

Limit auto select tool selection to drawing tools and added special logic to switch back after crop tool completion

Browse source
This commit is contained in:
Daniel Kuschny 2019-04-13 14:21:48 +02:00
parent fa89e16d4d
commit 3b413d0110
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,7 +140,7 @@ public virtual void ShowNodes()
Manager.NodesVisible = true;
}
public void Remove()
public virtual void Remove()
{
Manager.DeleteShape(this);
}

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

@ -68,7 +68,7 @@ public ShapeType CurrentTool
{
return currentTool;
}
private set
set
{
if (currentTool == value) return;
@ -879,7 +879,7 @@ private void EndRegionSelection()
SelectCurrentShape();
if (Options.SwitchToSelectionToolAfterDrawing)
if (Options.SwitchToSelectionToolAfterDrawing && (shape.ShapeCategory == ShapeCategory.Drawing || shape.ShapeCategory == ShapeCategory.Effect))
{
CurrentTool = ShapeType.ToolSelect;
}

9
ShareX.ScreenCaptureLib/Shapes/Tool/CropTool.cs
View file

@ -111,6 +111,15 @@ private void CancelButton_MousePressed(object sender, MouseEventArgs e)
Remove();
}
public override void Remove()
{
base.Remove();
if (Options.SwitchToSelectionToolAfterDrawing)
{
Manager.CurrentTool = ShapeType.ToolSelect;
}
}
public override void Dispose()
{
base.Dispose();