mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-06 05:05:42 +13:00
Mouse 4 click will swap shape type too
This commit is contained in:
parent
dd746bf6e1
commit
f0876a151c
1 changed files with 29 additions and 15 deletions
|
@ -70,6 +70,8 @@ private set
|
||||||
{
|
{
|
||||||
currentShapeType = value;
|
currentShapeType = value;
|
||||||
|
|
||||||
|
if (form.Mode == RectangleRegionMode.Annotation)
|
||||||
|
{
|
||||||
if (IsCurrentShapeTypeRegion)
|
if (IsCurrentShapeTypeRegion)
|
||||||
{
|
{
|
||||||
Config.LastRegionTool = CurrentShapeType;
|
Config.LastRegionTool = CurrentShapeType;
|
||||||
|
@ -78,6 +80,7 @@ private set
|
||||||
{
|
{
|
||||||
Config.LastAnnotationTool = CurrentShapeType;
|
Config.LastAnnotationTool = CurrentShapeType;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
DeselectShape();
|
DeselectShape();
|
||||||
|
|
||||||
|
@ -195,7 +198,6 @@ public AnnotationOptions AnnotationOptions
|
||||||
public event Action<ShapeType> CurrentShapeTypeChanged;
|
public event Action<ShapeType> CurrentShapeTypeChanged;
|
||||||
|
|
||||||
private RectangleRegionForm form;
|
private RectangleRegionForm form;
|
||||||
|
|
||||||
private ContextMenuStrip cmsContextMenu;
|
private ContextMenuStrip cmsContextMenu;
|
||||||
private ToolStripSeparator tssObjectOptions, tssShapeOptions;
|
private ToolStripSeparator tssObjectOptions, tssShapeOptions;
|
||||||
private ToolStripMenuItem tsmiDeleteSelected, tsmiDeleteAll, tsmiBorderColor, tsmiFillColor, tsmiHighlightColor;
|
private ToolStripMenuItem tsmiDeleteSelected, tsmiDeleteAll, tsmiBorderColor, tsmiFillColor, tsmiHighlightColor;
|
||||||
|
@ -843,6 +845,13 @@ private void form_MouseUp(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
form.Close(RegionResult.Close);
|
form.Close(RegionResult.Close);
|
||||||
}
|
}
|
||||||
|
else if (e.Button == MouseButtons.XButton1)
|
||||||
|
{
|
||||||
|
if (form.Mode == RectangleRegionMode.Annotation)
|
||||||
|
{
|
||||||
|
SwapShapeType();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void form_MouseDoubleClick(object sender, MouseEventArgs e)
|
private void form_MouseDoubleClick(object sender, MouseEventArgs e)
|
||||||
|
@ -924,14 +933,7 @@ private void form_KeyDown(object sender, KeyEventArgs e)
|
||||||
switch (e.KeyCode)
|
switch (e.KeyCode)
|
||||||
{
|
{
|
||||||
case Keys.Tab:
|
case Keys.Tab:
|
||||||
if (IsCurrentShapeTypeRegion)
|
SwapShapeType();
|
||||||
{
|
|
||||||
CurrentShapeType = Config.LastAnnotationTool;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
CurrentShapeType = Config.LastRegionTool;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case Keys.NumPad0:
|
case Keys.NumPad0:
|
||||||
CurrentShapeType = ShapeType.RegionRectangle;
|
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)
|
private Point SnapPosition(Point posOnClick, Point posCurrent)
|
||||||
{
|
{
|
||||||
Rectangle currentRect = CaptureHelpers.CreateRectangle(posOnClick, posCurrent);
|
Rectangle currentRect = CaptureHelpers.CreateRectangle(posOnClick, posCurrent);
|
||||||
|
|
Loading…
Reference in a new issue