Adding a better cancel job to the Pivot effect. Also redoing the showcase interface...

[ITKit.git] / ITPivotWindowEffect.m

diff --git a/ITPivotWindowEffect.m b/ITPivotWindowEffect.m
index 81fb8ce..2c87f68 100755 (executable)
--- a/ITPivotWindowEffect.m
+++ b/ITPivotWindowEffect.m
@@ -1,71 +1,135 @@
 #import "ITPivotWindowEffect.h"
 #import "ITCoreGraphicsHacks.h"
 #import "ITPivotWindowEffect.h"
 #import "ITCoreGraphicsHacks.h"

+#import "ITTransientStatusWindow.h"

 
 

-@implementation ITPivotWindowEffect

 
 

+@interface ITPivotWindowEffect (Private)
+- (void)setPivot:(float)angle;
+- (void)performAppearFromProgress:(float)progress effectTime:(float)time;
+- (void)performVanishFromProgress:(float)progress effectTime:(float)time;
+- (void)appearFinish;
+- (void)vanishFinish;
+@end
+
+
+@implementation ITPivotWindowEffect

 
 - (void)performAppear
 {
 
 - (void)performAppear
 {

-    NSLog(@"ITPivotWindowEffect does not implement performAppear.");
+    [self setWindowVisibility:ITTransientStatusWindowAppearingState];
+    [self performAppearFromProgress:0.0 effectTime:_effectTime];
+}
+
+- (void)performAppearFromProgress:(float)progress effectTime:(float)time
+{
+    _effectProgress = progress;
+    _effectSpeed = (1.0 / (EFFECT_FPS * time));
+    
+    if ( progress == 0.0 ) {
+        [self setPivot:315.0];
+        [_window setAlphaValue:0.0];
+    }
+
+    [_window orderFront:self];
+    _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
+                                                    target:self
+                                                  selector:@selector(appearStep)
+                                                  userInfo:nil
+                                                   repeats:YES];

 }
 
 - (void)performVanish
 {
 }
 
 - (void)performVanish
 {

-    NSLog(@"ITPivotWindowEffect does not implement performVanish.");
+    [self setWindowVisibility:ITTransientStatusWindowVanishingState];
+    [self performVanishFromProgress:1.0 effectTime:_effectTime];

 }
 
 }
 

-- (void)pivotEffect
+- (void)performVanishFromProgress:(float)progress effectTime:(float)time

 {
 {

-    if ( YES ) {
-        [self setPivot:315.0];
-        _effectProgress = 0.0;
-        [_window setAlphaValue:0.0];
-        [_window orderFront:self];
-        _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
-                                                        target:self
-                                                      selector:@selector(pivotStep)
-                                                      userInfo:nil
-                                                       repeats:YES];
-    } else {
-        [_window orderOut:self];
+    _effectProgress = progress;
+    _effectSpeed = (1.0 / (EFFECT_FPS * time));
+    if ( progress == 1.0 ) {
+        [self setPivot:0.0];
+        [_window setAlphaValue:1.0];

     }
     }

+
+    [_window orderFront:self];
+    _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
+                                                    target:self
+                                                  selector:@selector(vanishStep)
+                                                  userInfo:nil
+                                                   repeats:YES];
+}
+
+- (void)cancelAppear
+{
+    [self setWindowVisibility:ITTransientStatusWindowVanishingState];
+    
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+    
+    [self performVanishFromProgress:_effectProgress effectTime:(_effectTime / 3.5)];
+}
+
+- (void)cancelVanish
+{
+    [self setWindowVisibility:ITTransientStatusWindowAppearingState];
+
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+
+    [self performAppearFromProgress:_effectProgress effectTime:(_effectTime / 3.5)];

 }
 
 }
 

-- (void)pivotStep
+- (void)appearStep

 {
 {

-    if ( YES ) {
-        float interPivot = 0.0;
-        _effectProgress += (1.0 / (EFFECT_FPS * _effectTime));
-        _effectProgress = (_effectProgress < 1.0 ? _effectProgress : 1.0);
-        interPivot = (( sin((_effectProgress * pi) - (pi / 2)) + 1 ) / 2);
-        [self setPivot:((interPivot * 45) + 315)];
-        [_window setAlphaValue:interPivot];
-        if ( _effectProgress >= 1.0 ) {
-            [self pivotFinish];
-        }
-    } else {
-        //backwards
+    float interPivot = 0.0;
+    _effectProgress += _effectSpeed;
+    _effectProgress = (_effectProgress < 1.0 ? _effectProgress : 1.0);
+    interPivot = (( sin((_effectProgress * pi) - (pi / 2)) + 1 ) / 2);
+    [self setPivot:((interPivot * 45) + 315)];
+    [_window setAlphaValue:interPivot];
+
+    if ( _effectProgress >= 1.0 ) {
+        [self appearFinish];

     }
 }
 
     }
 }
 

-- (void)pivotFinish
+- (void)vanishStep

 {
 {

-    if ( YES ) {
-        [_effectTimer invalidate];
-        _effectTimer = nil;
-        _effectProgress = 0.0;
-    } else {
-        //backwards
+    float interPivot = 1.0;
+    _effectProgress -= _effectSpeed;
+    _effectProgress = (_effectProgress > 0.0 ? _effectProgress : 0.0);
+    interPivot = (( sin((_effectProgress * pi) - (pi / 2)) + 1 ) / 2);
+    [self setPivot:((interPivot * 45) + 315)];
+    [_window setAlphaValue:interPivot];
+
+    if ( _effectProgress <= 0.0 ) {
+        [self vanishFinish];

     }
 }
 
     }
 }
 

+- (void)appearFinish
+{
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+    [self setWindowVisibility:ITTransientStatusWindowVisibleState];
+}
+
+- (void)vanishFinish
+{
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+    [self setWindowVisibility:ITTransientStatusWindowHiddenState];
+}

 
 - (void)setPivot:(float)angle
 {
     float degAngle = (angle * (pi / 180));
 
 - (void)setPivot:(float)angle
 {
     float degAngle = (angle * (pi / 180));

+

     CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
     
     CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
     

- // Set pivot point
+ // Set pivot rotation point

     transform.tx = -32.0;
     transform.ty = [_window frame].size.height + 32.0;
 
     transform.tx = -32.0;
     transform.ty = [_window frame].size.height + 32.0;