mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-05 20:54:31 +13:00
In region capture menu key will open right click menu
This commit is contained in:
parent
b0e0465513
commit
fefcf2cf26
2 changed files with 28 additions and 23 deletions
|
@ -426,7 +426,7 @@ protected virtual void WriteTips(StringBuilder sb)
|
||||||
|
|
||||||
if (Mode == RectangleRegionMode.Annotation)
|
if (Mode == RectangleRegionMode.Annotation)
|
||||||
{
|
{
|
||||||
sb.AppendLine("[Right click] Open options menu");
|
sb.AppendLine("[Right click][Menu] Open options menu");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -829,7 +829,7 @@ private void form_MouseUp(object sender, MouseEventArgs e)
|
||||||
}
|
}
|
||||||
else if (form.Mode == RectangleRegionMode.Annotation)
|
else if (form.Mode == RectangleRegionMode.Annotation)
|
||||||
{
|
{
|
||||||
RunRegionCaptureAction(Config.MouseRightClickAction);
|
RunAction(Config.MouseRightClickAction);
|
||||||
}
|
}
|
||||||
else if (IsShapeIntersect())
|
else if (IsShapeIntersect())
|
||||||
{
|
{
|
||||||
|
@ -842,15 +842,15 @@ private void form_MouseUp(object sender, MouseEventArgs e)
|
||||||
}
|
}
|
||||||
else if (e.Button == MouseButtons.Middle)
|
else if (e.Button == MouseButtons.Middle)
|
||||||
{
|
{
|
||||||
RunRegionCaptureAction(Config.MouseMiddleClickAction);
|
RunAction(Config.MouseMiddleClickAction);
|
||||||
}
|
}
|
||||||
else if (e.Button == MouseButtons.XButton1)
|
else if (e.Button == MouseButtons.XButton1)
|
||||||
{
|
{
|
||||||
RunRegionCaptureAction(Config.Mouse4ClickAction);
|
RunAction(Config.Mouse4ClickAction);
|
||||||
}
|
}
|
||||||
else if (e.Button == MouseButtons.XButton2)
|
else if (e.Button == MouseButtons.XButton2)
|
||||||
{
|
{
|
||||||
RunRegionCaptureAction(Config.Mouse5ClickAction);
|
RunAction(Config.Mouse5ClickAction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -990,10 +990,13 @@ private void form_KeyUp(object sender, KeyEventArgs e)
|
||||||
EndRegionSelection();
|
EndRegionSelection();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case Keys.Apps:
|
||||||
|
OpenOptionsMenu();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RunRegionCaptureAction(RegionCaptureAction action)
|
private void RunAction(RegionCaptureAction action)
|
||||||
{
|
{
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
|
@ -1011,23 +1014,13 @@ private void RunRegionCaptureAction(RegionCaptureAction action)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case RegionCaptureAction.RemoveShape:
|
case RegionCaptureAction.RemoveShape:
|
||||||
if (IsShapeIntersect())
|
|
||||||
{
|
|
||||||
DeleteIntersectShape();
|
DeleteIntersectShape();
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case RegionCaptureAction.OpenOptionsMenu:
|
case RegionCaptureAction.OpenOptionsMenu:
|
||||||
if (form.Mode == RectangleRegionMode.Annotation && cmsContextMenu != null)
|
OpenOptionsMenu();
|
||||||
{
|
|
||||||
cmsContextMenu.Show(form, InputManager.MousePosition0Based.Add(-10, -10));
|
|
||||||
Config.ShowMenuTip = false;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case RegionCaptureAction.SwapToolType:
|
case RegionCaptureAction.SwapToolType:
|
||||||
if (form.Mode == RectangleRegionMode.Annotation)
|
|
||||||
{
|
|
||||||
SwapShapeType();
|
SwapShapeType();
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case RegionCaptureAction.CaptureFullscreen:
|
case RegionCaptureAction.CaptureFullscreen:
|
||||||
form.Close(RegionResult.Fullscreen);
|
form.Close(RegionResult.Fullscreen);
|
||||||
|
@ -1256,6 +1249,8 @@ private void UpdateCurrentShape()
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SwapShapeType()
|
private void SwapShapeType()
|
||||||
|
{
|
||||||
|
if (form.Mode == RectangleRegionMode.Annotation)
|
||||||
{
|
{
|
||||||
if (IsCurrentShapeTypeRegion)
|
if (IsCurrentShapeTypeRegion)
|
||||||
{
|
{
|
||||||
|
@ -1266,6 +1261,16 @@ private void SwapShapeType()
|
||||||
CurrentShapeType = Config.LastRegionTool;
|
CurrentShapeType = Config.LastRegionTool;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OpenOptionsMenu()
|
||||||
|
{
|
||||||
|
if (form.Mode == RectangleRegionMode.Annotation && cmsContextMenu != null)
|
||||||
|
{
|
||||||
|
cmsContextMenu.Show(form, InputManager.MousePosition0Based.Add(-10, -10));
|
||||||
|
Config.ShowMenuTip = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private Point SnapPosition(Point posOnClick, Point posCurrent)
|
private Point SnapPosition(Point posOnClick, Point posCurrent)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue