mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-03 02:36:50 +13:00
Limit auto select tool selection to drawing tools and added special logic to switch back after crop tool completion
This commit is contained in:
parent
fa89e16d4d
commit
3b413d0110
3 changed files with 12 additions and 3 deletions
|
@ -140,7 +140,7 @@ public virtual void ShowNodes()
|
||||||
Manager.NodesVisible = true;
|
Manager.NodesVisible = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Remove()
|
public virtual void Remove()
|
||||||
{
|
{
|
||||||
Manager.DeleteShape(this);
|
Manager.DeleteShape(this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,7 +68,7 @@ public ShapeType CurrentTool
|
||||||
{
|
{
|
||||||
return currentTool;
|
return currentTool;
|
||||||
}
|
}
|
||||||
private set
|
set
|
||||||
{
|
{
|
||||||
if (currentTool == value) return;
|
if (currentTool == value) return;
|
||||||
|
|
||||||
|
@ -879,7 +879,7 @@ private void EndRegionSelection()
|
||||||
|
|
||||||
SelectCurrentShape();
|
SelectCurrentShape();
|
||||||
|
|
||||||
if (Options.SwitchToSelectionToolAfterDrawing)
|
if (Options.SwitchToSelectionToolAfterDrawing && (shape.ShapeCategory == ShapeCategory.Drawing || shape.ShapeCategory == ShapeCategory.Effect))
|
||||||
{
|
{
|
||||||
CurrentTool = ShapeType.ToolSelect;
|
CurrentTool = ShapeType.ToolSelect;
|
||||||
}
|
}
|
||||||
|
|
|
@ -111,6 +111,15 @@ private void CancelButton_MousePressed(object sender, MouseEventArgs e)
|
||||||
Remove();
|
Remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void Remove()
|
||||||
|
{
|
||||||
|
base.Remove();
|
||||||
|
if (Options.SwitchToSelectionToolAfterDrawing)
|
||||||
|
{
|
||||||
|
Manager.CurrentTool = ShapeType.ToolSelect;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public override void Dispose()
|
public override void Dispose()
|
||||||
{
|
{
|
||||||
base.Dispose();
|
base.Dispose();
|
||||||
|
|
Loading…
Reference in a new issue