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

Removed unneeded variable, ensure shape stays selected after drawing

Browse source
This commit is contained in:
Daniel Kuschny 2019-04-29 18:28:54 +02:00
parent e3b39685a0
commit 8cb8416cd4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,6 @@ public ShapeType CurrentTool
{ {
if (currentTool == value) return; if (currentTool == value) return;
ShapeType previousTool = currentTool;
currentTool = value; currentTool = value;
if (Form.IsAnnotationMode) if (Form.IsAnnotationMode)
@ -96,9 +95,12 @@ public ShapeType CurrentTool
if (CurrentShape != null) if (CurrentShape != null)
{ {
// do not keep selection if select tool does not handle it // do not keep selection if select tool does not handle it
if (currentTool == ShapeType.ToolSelect && !CurrentShape.IsHandledBySelectTool) if (currentTool == ShapeType.ToolSelect)
{ {
DeselectCurrentShape(); if (!CurrentShape.IsHandledBySelectTool)
{
DeselectCurrentShape();
}
} }
// do not keep selection if we switch away from a tool and the selected shape does not match the new type // do not keep selection if we switch away from a tool and the selected shape does not match the new type
else if (CurrentShape.ShapeType != currentTool) else if (CurrentShape.ShapeType != currentTool)