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

Don't store move speed in region capture options

Browse source
This commit is contained in:
Jaex 2016-06-25 10:55:32 +03:00
parent b166fe2ef6
commit 8926d113cc
2 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ShareX.ScreenCaptureLib/RegionCaptureOptions.cs
View file

@ -49,6 +49,7 @@ public class RegionCaptureOptions
new SnapSize(1280, 720), // 720p
new SnapSize(1920, 1080) // 1080p
};
public int SnapDistance = 30;
public AnnotationOptions AnnotationOptions = new AnnotationOptions();
public bool ShowTips = true;
@ -65,8 +66,5 @@ public class RegionCaptureOptions
public ShapeType LastRegionTool = ShapeType.RegionRectangle;
public ShapeType LastAnnotationTool = ShapeType.DrawingRectangle;
public bool ShowMenuTip = true;
public int MinMoveSpeed = 1;
public int MaxMoveSpeed = 10;
public int SnapDistance = 20;
}
}

34
ShareX.ScreenCaptureLib/Shapes/ResizeManager.cs
View file

@ -32,6 +32,9 @@ namespace ShareX.ScreenCaptureLib
{
public class ResizeManager
{
public const int MinMoveSpeed = 1;
public const int MaxMoveSpeed = 10;
private bool visible;
public bool Visible
@ -76,26 +79,17 @@ public bool Visible
}
public bool IsResizing { get; private set; }
public int MaxMoveSpeed { get; set; }
public int MinMoveSpeed { get; set; }
public bool IsBottomRightResizing { get; set; }
private bool IsUpPressed { get; set; }
private bool IsDownPressed { get; set; }
private bool IsLeftPressed { get; set; }
private bool IsRightPressed { get; set; }
private ShapeManager shapeManager;
private NodeObject[] nodes;
private bool isUpPressed, isDownPressed, isLeftPressed, isRightPressed;
private Rectangle tempRect;
public ResizeManager(BaseRegionForm form, ShapeManager shapeManager)
{
this.shapeManager = shapeManager;
MinMoveSpeed = form.Config.MinMoveSpeed;
MaxMoveSpeed = form.Config.MaxMoveSpeed;
form.KeyDown += form_KeyDown;
form.KeyUp += form_KeyUp;
@ -202,16 +196,16 @@ private void form_KeyDown(object sender, KeyEventArgs e)
switch (e.KeyCode)
{
case Keys.Up:
IsUpPressed = true;
isUpPressed = true;
break;
case Keys.Down:
IsDownPressed = true;
isDownPressed = true;
break;
case Keys.Left:
IsLeftPressed = true;
isLeftPressed = true;
break;
case Keys.Right:
IsRightPressed = true;
isRightPressed = true;
break;
case Keys.Menu:
IsBottomRightResizing = true;
@ -220,8 +214,8 @@ private void form_KeyDown(object sender, KeyEventArgs e)
// Calculate cursor movement
int speed = e.Shift ? MaxMoveSpeed : MinMoveSpeed;
int y = IsUpPressed && IsDownPressed ? 0 : IsDownPressed ? speed : IsUpPressed ? -speed : 0;
int x = IsLeftPressed && IsRightPressed ? 0 : IsRightPressed ? speed : IsLeftPressed ? -speed : 0;
int y = isUpPressed && isDownPressed ? 0 : isDownPressed ? speed : isUpPressed ? -speed : 0;
int x = isLeftPressed && isRightPressed ? 0 : isRightPressed ? speed : isLeftPressed ? -speed : 0;
// Move the cursor
if (shapeManager.CurrentShape == null || shapeManager.IsCreating)
@ -246,16 +240,16 @@ private void form_KeyUp(object sender, KeyEventArgs e)
switch (e.KeyCode)
{
case Keys.Up:
IsUpPressed = false;
isUpPressed = false;
break;
case Keys.Down:
IsDownPressed = false;
isDownPressed = false;
break;
case Keys.Left:
IsLeftPressed = false;
isLeftPressed = false;
break;
case Keys.Right:
IsRightPressed = false;
isRightPressed = false;
break;
case Keys.Menu:
IsBottomRightResizing = false;