github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 04:59:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Zoom size is now 20% of the smallest screen "range", usually the height, but if rotated CCW/CW this would be the width. This prevents the zoomer from being to large.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2349 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-12-03 14:24:55 +00:00
commit aa8063ea88
1 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Greenshot/Forms/CaptureForm.cs
View file

@ -71,9 +71,8 @@ namespace Greenshot.Forms {
private Point previousMousePos = Point.Empty; private Point previousMousePos = Point.Empty;
private FixMode fixMode = FixMode.None; private FixMode fixMode = FixMode.None;
private RectangleAnimator windowAnimator = new RectangleAnimator(Rectangle.Empty, Rectangle.Empty, 0, EasingType.Quadratic); private RectangleAnimator windowAnimator = new RectangleAnimator(Rectangle.Empty, Rectangle.Empty, 0, EasingType.Quadratic);
private Size zoomSize = new Size(200, 200);
private Point zoomOffset = new Point(20, 20); private RectangleAnimator zoomAnimator = null;
private RectangleAnimator zoomAnimator;
/// <summary> /// <summary>
/// Property to access the selected capture rectangle /// Property to access the selected capture rectangle
@ -133,8 +132,6 @@ namespace Greenshot.Forms {
User32.ReleaseDC(hDCDesktop); User32.ReleaseDC(hDCDesktop);
LOG.DebugFormat("VRefresh {0}", vRefesh); LOG.DebugFormat("VRefresh {0}", vRefesh);
zoomAnimator = new RectangleAnimator(Rectangle.Empty, new Rectangle(zoomOffset, zoomSize), 20, EasingType.Quintic, EasingMode.EaseOut);
// comment this out if the timer should not be used // comment this out if the timer should not be used
timer = new Timer(); timer = new Timer();
@ -178,7 +175,10 @@ namespace Greenshot.Forms {
// set cursor location // set cursor location
cursorPos = WindowCapture.GetCursorLocationRelativeToScreenBounds(); cursorPos = WindowCapture.GetCursorLocationRelativeToScreenBounds();
// Initialize with a invalid position
zoomAnimator = new RectangleAnimator(Rectangle.Empty, new Rectangle(int.MaxValue, int.MaxValue, 0, 0), 20, EasingType.Quintic, EasingMode.EaseOut);
VerifyZoomAnimation(cursorPos);
this.SuspendLayout(); this.SuspendLayout();
this.Bounds = capture.ScreenBounds; this.Bounds = capture.ScreenBounds;
this.ResumeLayout(); this.ResumeLayout();
@ -495,8 +495,8 @@ namespace Greenshot.Forms {
Rectangle zoomArea = zoomAnimator.Current; Rectangle zoomArea = zoomAnimator.Current;
zoomArea.Offset(lastPos); zoomArea.Offset(lastPos);
Invalidate(zoomArea); Invalidate(zoomArea);
VerifyZoomAnimation(cursorPos);
zoomArea = AnimateZoomArea(cursorPos); zoomArea = zoomAnimator.Next();
zoomArea.Offset(cursorPos); zoomArea.Offset(cursorPos);
Invalidate(zoomArea); Invalidate(zoomArea);
} }
@ -512,22 +512,19 @@ namespace Greenshot.Forms {
} }
/// <summary> /// <summary>
/// Checks if the Zoom area can move there where it wants to go /// Checks if the Zoom area can move there where it wants to go, change direction if not.
/// Change direction if not.
/// </summary> /// </summary>
private Rectangle AnimateZoomArea(Point pos) { private void VerifyZoomAnimation(Point pos) {
Rectangle ret;
Rectangle screenBounds = Screen.GetBounds(MousePosition); Rectangle screenBounds = Screen.GetBounds(MousePosition);
// convert to be relative to top left corner of all screen bounds // convert to be relative to top left corner of all screen bounds
screenBounds.Location = WindowCapture.GetLocationRelativeToScreenBounds(screenBounds.Location); screenBounds.Location = WindowCapture.GetLocationRelativeToScreenBounds(screenBounds.Location);
int relativeZoomSize = Math.Min(screenBounds.Width, screenBounds.Height) / 5;
Size zoomSize = new Size(relativeZoomSize, relativeZoomSize);
Point zoomOffset = new Point(20, 20);
Rectangle targetRectangle = zoomAnimator.Final; Rectangle targetRectangle = zoomAnimator.Final;
targetRectangle.Offset(pos); targetRectangle.Offset(pos);
if (screenBounds.Contains(targetRectangle)) { if (!screenBounds.Contains(targetRectangle)) {
// All okay
ret = zoomAnimator.Next();
} else {
Point destinationLocation; Point destinationLocation;
Rectangle tl = new Rectangle(pos.X - (zoomOffset.X + zoomSize.Width), pos.Y - (zoomOffset.Y + zoomSize.Height), zoomSize.Width, zoomSize.Height); Rectangle tl = new Rectangle(pos.X - (zoomOffset.X + zoomSize.Width), pos.Y - (zoomOffset.Y + zoomSize.Height), zoomSize.Width, zoomSize.Height);
Rectangle tr = new Rectangle(pos.X + zoomOffset.X, pos.Y - (zoomOffset.Y + zoomSize.Height), zoomSize.Width, zoomSize.Height); Rectangle tr = new Rectangle(pos.X + zoomOffset.X, pos.Y - (zoomOffset.Y + zoomSize.Height), zoomSize.Width, zoomSize.Height);
@ -546,9 +543,7 @@ namespace Greenshot.Forms {
//zoomAnimator.ChangeDestination(new Rectangle(new Point(-10, -10), new Size(20, 20))); //zoomAnimator.ChangeDestination(new Rectangle(new Point(-10, -10), new Size(20, 20)));
//zoomAnimator.QueueDestinationLeg(new Rectangle(destinationLocation, zoomSize)); //zoomAnimator.QueueDestinationLeg(new Rectangle(destinationLocation, zoomSize));
zoomAnimator.ChangeDestination(new Rectangle(destinationLocation, zoomSize)); zoomAnimator.ChangeDestination(new Rectangle(destinationLocation, zoomSize));
ret = zoomAnimator.Next();
} }
return ret;
} }
/// <summary> /// <summary>