CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-02 18:26:27 +13:00
Code Issues Projects Releases Packages Wiki Activity

Disable annotation hotkeys in non annotation mode

Browse source
This commit is contained in:
Jaex 2016-05-26 23:55:10 +03:00
parent 8fe7a2ea37
commit 39dfd0cc88
2 changed files with 70 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs
View file

@ -480,6 +480,8 @@ protected virtual void WriteTips(StringBuilder sb)
sb.AppendLine(Resources.RectangleRegion_WriteTips__1__2__3_____0__Monitor_capture);
sb.AppendLine(Resources.RectangleRegion_WriteTips_____Active_monitor_capture);
if (Mode == RectangleRegionMode.Annotation)
{
sb.AppendLine();
// TODO: Translate
@ -511,6 +513,7 @@ protected virtual void WriteTips(StringBuilder sb)
if (ShapeManager.CurrentShapeType == ShapeType.DrawingHighlight) sb.Append("-> ");
sb.AppendLine(ShapeType.DrawingHighlight.GetLocalizedDescription());
}
}
private string GetAreaText(Rectangle area)
{

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

@ -854,7 +854,7 @@ private void form_MouseWheel(object sender, MouseEventArgs e)
if (Config.MagnifierPixelCount > 2) Config.MagnifierPixelCount -= 2;
}
}
else
else if (form.Mode == RectangleRegionMode.Annotation)
{
if (e.Delta > 0)
{
@ -895,6 +895,12 @@ private void form_KeyDown(object sender, KeyEventArgs e)
case Keys.Menu:
IsSnapResizing = true;
break;
}
if (form.Mode == RectangleRegionMode.Annotation)
{
switch (e.KeyCode)
{
case Keys.NumPad0:
CurrentShapeType = ShapeType.RegionRectangle;
break;
@ -927,6 +933,7 @@ private void form_KeyDown(object sender, KeyEventArgs e)
break;
}
}
}
private void form_KeyUp(object sender, KeyEventArgs e)
{