github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 02:37:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added easing to the animations

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2340 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-11-30 11:44:34 +00:00
commit 3b9cc41832
2 changed files with 193 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Greenshot/Forms/CaptureForm.cs
View file

@ -71,8 +71,8 @@ namespace Greenshot.Forms {
private bool isZooming = true;
private Point previousMousePos = Point.Empty;
private FixMode fixMode = FixMode.None;
private RectangleAnimator windowAnimator = new RectangleAnimator(Rectangle.Empty, Rectangle.Empty, 0);
private FlexibleAnimator<Size> zoomAnimator;
private RectangleAnimator windowAnimator = new RectangleAnimator(Rectangle.Empty, Rectangle.Empty, 0, EasingType.Linear);
private SizeAnimator zoomAnimator = new SizeAnimator(Size.Empty, new Size(200, 200), 30, EasingType.Quintic);
/// <summary>
/// Property to access the selected capture rectangle
@ -179,14 +179,6 @@ namespace Greenshot.Forms {
WindowDetails.ToForeground(this.Handle);
this.TopMost = true;
zoomAnimator = new FlexibleAnimator<Size>(Size.Empty,
delegate(Size current) {
return current.Width < 200;
},
delegate(Size current) {
int newvalue = current.Width + (220-current.Width) /5;
return new Size(newvalue, newvalue);
});
if (timer != null) {
timer.Interval = 30;
timer.Tick += new EventHandler(timer_Tick);
@ -462,7 +454,8 @@ namespace Greenshot.Forms {
Invalidate(invalidateRectangle);
}
if (selectedCaptureWindow != null && !selectedCaptureWindow.Equals(lastWindow)) {
windowAnimator = new RectangleAnimator(lastCaptureRect,captureRect, 5);
// Window changes, make new animation from current to target
windowAnimator = new RectangleAnimator(windowAnimator.Current,captureRect, 18, EasingType.Quintic);
Rectangle invalidateRectangle = new Rectangle(lastCaptureRect.Location, lastCaptureRect.Size);
invalidateRectangle.Inflate(SAFETY_SIZE, SAFETY_SIZE);
Invalidate(invalidateRectangle);