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

Merge pull request #2915 from L1Q/master

Browse source 
Fix AutomaticPan
This commit is contained in:
Jaex 2017-11-09 06:05:10 +03:00 committed by GitHub
parent 7f347d916f 27f790d862
commit ec88a67703
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
View file

@ -78,7 +78,7 @@ public Color CurrentColor
public SimpleWindowInfo SelectedWindow { get; private set; } public SimpleWindowInfo SelectedWindow { get; private set; }
public Vector2 CanvasCenterPoint { get; set; } = new Vector2(0.5f, 0.5f); public Vector2 CanvasCenterOffset { get; set; } = new Vector2(0f, 0f);
internal ShapeManager ShapeManager { get; private set; } internal ShapeManager ShapeManager { get; private set; }
internal List<DrawableObject> DrawableObjects { get; private set; } internal List<DrawableObject> DrawableObjects { get; private set; }
@ -372,12 +372,12 @@ private void Pan(Point delta)
Pan(delta.X, delta.Y); Pan(delta.X, delta.Y);
} }
private void AutomaticPan(Vector2 center) private void AutomaticPan(Vector2 centerOffset)
{ {
if (IsEditorMode) if (IsEditorMode)
{ {
int x = (int)Math.Round(ClientArea.Width * center.X); int x = (int)Math.Round(ClientArea.Width * 0.5f + centerOffset.X);
int y = (int)Math.Round(ToolbarHeight + (ClientArea.Height - ToolbarHeight) * center.Y); int y = (int)Math.Round(ToolbarHeight + (ClientArea.Height - ToolbarHeight) * 0.5f + centerOffset.Y);
int newX = x - CanvasRectangle.Width / 2; int newX = x - CanvasRectangle.Width / 2;
int newY = y - CanvasRectangle.Height / 2; int newY = y - CanvasRectangle.Height / 2;
int deltaX = newX - CanvasRectangle.X; int deltaX = newX - CanvasRectangle.X;
@ -388,18 +388,19 @@ private void AutomaticPan(Vector2 center)
private void AutomaticPan() private void AutomaticPan()
{ {
AutomaticPan(CanvasCenterPoint); AutomaticPan(CanvasCenterOffset);
} }
private void UpdateCenterPoint() private void UpdateCenterOffset()
{ {
CanvasCenterPoint = new Vector2((CanvasRectangle.X + CanvasRectangle.Width / 2f) / ClientArea.Width, CanvasCenterOffset = new Vector2(
(CanvasRectangle.Y + CanvasRectangle.Height / 2f) / ClientArea.Height); (CanvasRectangle.X + CanvasRectangle.Width / 2f) - ClientArea.Width / 2f,
(CanvasRectangle.Y + CanvasRectangle.Height / 2f) - ClientArea.Height / 2f);
} }
public void CenterCanvas() public void CenterCanvas()
{ {
CanvasCenterPoint = new Vector2(0.5f, 0.5f); CanvasCenterOffset = new Vector2(0f, 0f);
AutomaticPan(); AutomaticPan();
} }
@ -621,7 +622,7 @@ private new void Update()
if (ShapeManager.IsPanning) if (ShapeManager.IsPanning)
{ {
Pan(InputManager.MouseVelocity); Pan(InputManager.MouseVelocity);
UpdateCenterPoint(); UpdateCenterOffset();
} }
borderDotPen.DashOffset = (float)timerStart.Elapsed.TotalSeconds * -15; borderDotPen.DashOffset = (float)timerStart.Elapsed.TotalSeconds * -15;