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

Mouse 4 click will swap shape type too

Browse source
This commit is contained in:
Jaex 2016-06-12 14:37:03 +03:00
parent dd746bf6e1
commit f0876a151c
1 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,13 +70,16 @@ private set
{
currentShapeType = value;
if (IsCurrentShapeTypeRegion)
if (form.Mode == RectangleRegionMode.Annotation)
{
Config.LastRegionTool = CurrentShapeType;
}
else
{
Config.LastAnnotationTool = CurrentShapeType;
if (IsCurrentShapeTypeRegion)
{
Config.LastRegionTool = CurrentShapeType;
}
else
{
Config.LastAnnotationTool = CurrentShapeType;
}
}
DeselectShape();
@ -195,7 +198,6 @@ public AnnotationOptions AnnotationOptions
public event Action<ShapeType> CurrentShapeTypeChanged;
private RectangleRegionForm form;
private ContextMenuStrip cmsContextMenu;
private ToolStripSeparator tssObjectOptions, tssShapeOptions;
private ToolStripMenuItem tsmiDeleteSelected, tsmiDeleteAll, tsmiBorderColor, tsmiFillColor, tsmiHighlightColor;
@ -843,6 +845,13 @@ private void form_MouseUp(object sender, MouseEventArgs e)
{
form.Close(RegionResult.Close);
}
else if (e.Button == MouseButtons.XButton1)
{
if (form.Mode == RectangleRegionMode.Annotation)
{
SwapShapeType();
}
}
}
private void form_MouseDoubleClick(object sender, MouseEventArgs e)
@ -924,14 +933,7 @@ private void form_KeyDown(object sender, KeyEventArgs e)
switch (e.KeyCode)
{
case Keys.Tab:
if (IsCurrentShapeTypeRegion)
{
CurrentShapeType = Config.LastAnnotationTool;
}
else
{
CurrentShapeType = Config.LastRegionTool;
}
SwapShapeType();
break;
case Keys.NumPad0:
CurrentShapeType = ShapeType.RegionRectangle;
@ -1208,6 +1210,18 @@ private void UpdateCurrentShape()
}
}
private void SwapShapeType()
{
if (IsCurrentShapeTypeRegion)
{
CurrentShapeType = Config.LastAnnotationTool;
}
else
{
CurrentShapeType = Config.LastRegionTool;
}
}
private Point SnapPosition(Point posOnClick, Point posCurrent)
{
Rectangle currentRect = CaptureHelpers.CreateRectangle(posOnClick, posCurrent);