X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/f9ac1766dbe420e477be299e49b2d8f69cafe5ec..c514c1ffefd1a84c7df329864d2269e1ed05da6d:/ITPivotWindowEffect.m?ds=sidebyside

diff --git a/ITPivotWindowEffect.m b/ITPivotWindowEffect.m
index 2c87f68..cf92f12 100755
--- a/ITPivotWindowEffect.m
+++ b/ITPivotWindowEffect.m
@@ -6,23 +6,33 @@
 @interface ITPivotWindowEffect (Private)
 - (void)setPivot:(float)angle;
 - (void)performAppearFromProgress:(float)progress effectTime:(float)time;
-- (void)performVanishFromProgress:(float)progress effectTime:(float)time;
+- (void)appearStep;
 - (void)appearFinish;
+- (void)performVanishFromProgress:(float)progress effectTime:(float)time;
+- (void)vanishStep;
 - (void)vanishFinish;
 @end
 
 
 @implementation ITPivotWindowEffect
 
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark APPEAR METHODS
+/*************************************************************************/
+
 - (void)performAppear
 {
-    [self setWindowVisibility:ITTransientStatusWindowAppearingState];
+    __idle = NO;
+    
+    [self setWindowVisibility:ITWindowAppearingState];
     [self performAppearFromProgress:0.0 effectTime:_effectTime];
 }
 
 - (void)performAppearFromProgress:(float)progress effectTime:(float)time
 {
-    _effectProgress = progress;
+    [_window setEffectProgress:progress];
     _effectSpeed = (1.0 / (EFFECT_FPS * time));
     
     if ( progress == 0.0 ) {
@@ -38,107 +48,168 @@
                                                    repeats:YES];
 }
 
-- (void)performVanish
+- (void)appearStep
 {
-    [self setWindowVisibility:ITTransientStatusWindowVanishingState];
-    [self performVanishFromProgress:1.0 effectTime:_effectTime];
-}
+    float interPivot = 0.0;
+    [_window setEffectProgress:([_window effectProgress] + _effectSpeed)];
+    [_window setEffectProgress:( ([_window effectProgress] < 1.0) ? [_window effectProgress] : 1.0)];
+    interPivot = (( sin(([_window effectProgress] * pi) - (pi / 2)) + 1 ) / 2);
+    [self setPivot:((interPivot * 45) + 315)];
+    [_window setAlphaValue:interPivot];
 
-- (void)performVanishFromProgress:(float)progress effectTime:(float)time
-{
-    _effectProgress = progress;
-    _effectSpeed = (1.0 / (EFFECT_FPS * time));
-    if ( progress == 1.0 ) {
-        [self setPivot:0.0];
-        [_window setAlphaValue:1.0];
+    if ( [_window effectProgress] >= 1.0 ) {
+        [self appearFinish];
     }
-
-    [_window orderFront:self];
-    _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
-                                                    target:self
-                                                  selector:@selector(vanishStep)
-                                                  userInfo:nil
-                                                   repeats:YES];
 }
 
-- (void)cancelAppear
+- (void)appearFinish
 {
-    [self setWindowVisibility:ITTransientStatusWindowVanishingState];
-    
     [_effectTimer invalidate];
     _effectTimer = nil;
-    
-    [self performVanishFromProgress:_effectProgress effectTime:(_effectTime / 3.5)];
+    [self setWindowVisibility:ITWindowVisibleState];
+
+    __idle = YES;
+
+    if ( __shouldReleaseWhenIdle ) {
+        [self release];
+    }
 }
 
-- (void)cancelVanish
+- (void)cancelAppear
 {
-    [self setWindowVisibility:ITTransientStatusWindowAppearingState];
+    [self setWindowVisibility:ITWindowVanishingState];
 
     [_effectTimer invalidate];
     _effectTimer = nil;
 
-    [self performAppearFromProgress:_effectProgress effectTime:(_effectTime / 3.5)];
+    [self performVanishFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];
 }
 
-- (void)appearStep
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark VANISH METHODS
+/*************************************************************************/
+
+- (void)performVanish
 {
-    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];
+    __idle = NO;
+    
+    [self setWindowVisibility:ITWindowVanishingState];
+    [self performVanishFromProgress:1.0 effectTime:_effectTime];
+}
 
-    if ( _effectProgress >= 1.0 ) {
-        [self appearFinish];
+- (void)performVanishFromProgress:(float)progress effectTime:(float)time
+{
+    [_window setEffectProgress: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)vanishStep
 {
     float interPivot = 1.0;
-    _effectProgress -= _effectSpeed;
-    _effectProgress = (_effectProgress > 0.0 ? _effectProgress : 0.0);
-    interPivot = (( sin((_effectProgress * pi) - (pi / 2)) + 1 ) / 2);
+    [_window setEffectProgress:([_window effectProgress] - _effectSpeed)];
+    [_window setEffectProgress:( ([_window effectProgress] > 0.0) ? [_window effectProgress] : 0.0)];
+    interPivot = (( sin(([_window effectProgress] * pi) - (pi / 2)) + 1 ) / 2);
     [self setPivot:((interPivot * 45) + 315)];
     [_window setAlphaValue:interPivot];
 
-    if ( _effectProgress <= 0.0 ) {
+    if ( [_window effectProgress] <= 0.0 ) {
         [self vanishFinish];
     }
 }
 
-- (void)appearFinish
+- (void)vanishFinish
 {
     [_effectTimer invalidate];
     _effectTimer = nil;
-    [self setWindowVisibility:ITTransientStatusWindowVisibleState];
+    [_window orderOut:self];
+    [_window setAlphaValue:1.0];
+    [self setPivot:0.0];
+    [self setWindowVisibility:ITWindowHiddenState];
+
+    __idle = YES;
+
+    if ( __shouldReleaseWhenIdle ) {
+        [self release];
+    }
 }
 
-- (void)vanishFinish
+- (void)cancelVanish
 {
+    [self setWindowVisibility:ITWindowAppearingState];
+
     [_effectTimer invalidate];
     _effectTimer = nil;
-    [self setWindowVisibility:ITTransientStatusWindowHiddenState];
+
+    [self performAppearFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];
 }
 
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark PRIVATE METHOD IMPLEMENTATIONS
+/*************************************************************************/
+
 - (void)setPivot:(float)angle
 {
-    float degAngle = (angle * (pi / 180));
-
-    CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
+    float degAngle;
+    NSPoint appearPoint;
+    CGAffineTransform transform;
+    
+    if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) {
+        if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) {
+            degAngle = (angle * (pi / 180));
+        } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionTop ) {
+            degAngle = (-angle * (pi / 180));
+        }
+    } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionRight ) {
+        if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) {
+            degAngle = (angle * (pi / 180));
+        } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionTop ) {
+            degAngle = (angle * (pi / 180));
+        }
+    }
+    
+    transform = CGAffineTransformMakeRotation(degAngle);
     
  // Set pivot rotation point
-    transform.tx = -32.0;
-    transform.ty = [_window frame].size.height + 32.0;
-
+    //transform.tx = -( 32.0 + [[_window screen] visibleFrame].origin.x );
+    transform.ty = ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y );
+    
+    if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) {
+        appearPoint.x = -( 32.0 + [[_window screen] visibleFrame].origin.x );
+        transform.tx = -( 32.0 + [[_window screen] visibleFrame].origin.x );
+    } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionRight ) {
+        transform.tx = -( 32.0 + [[_window screen] visibleFrame].origin.x ) + [_window frame].size.width;
+        appearPoint.x = -(([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) - 32.0);
+    } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionCenter ) {
+        appearPoint.x = ( [_window frame].size.width - [[_window screen] visibleFrame].size.width ) / 2;
+    }
+    
+    if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionTop ) {
+        appearPoint.y = ( [_window frame].size.height - [[_window screen] visibleFrame].size.height) / 2;
+    } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) {
+        appearPoint.y = -( [[_window screen] frame].size.height - ([_window frame].origin.y) + 32.0 + [[_window screen] visibleFrame].origin.y) ;
+    }/* else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionMiddle ) {
+        appearPoint.y = ( [_window frame].size.height - [[_window screen] visibleFrame].size.height) / 2;
+    }*/
     CGSSetWindowTransform([NSApp contextID],
                           (CGSWindowID)[_window windowNumber],
-                          CGAffineTransformTranslate(transform,
-                                                     (([_window frame].origin.x - 32.0) * -1),
-                                                     (([[_window screen] frame].size.height - ([_window frame].origin.y) + 32.0) * -1) ));
+                          CGAffineTransformTranslate( transform,
+                                                     appearPoint.x,
+                                                     appearPoint.y ) );
 }
 
-
 @end