Adding quick fix get-the-fuck-out-of-the-way positioning

[ITKit.git] / ITPivotWindowEffect.m

diff --git a/ITPivotWindowEffect.m b/ITPivotWindowEffect.m
index 85b5f50..81a4b5c 100755 (executable)
--- a/ITPivotWindowEffect.m
+++ b/ITPivotWindowEffect.m
@@ -5,19 +5,41 @@
 
 @interface ITPivotWindowEffect (Private)
 - (void)setPivot:(float)angle;
 
 @interface ITPivotWindowEffect (Private)
 - (void)setPivot:(float)angle;

+- (void)performAppearFromProgress:(float)progress effectTime:(float)time;
+- (void)appearStep;

 - (void)appearFinish;
 - (void)appearFinish;

+- (void)performVanishFromProgress:(float)progress effectTime:(float)time;
+- (void)vanishStep;

 - (void)vanishFinish;
 @end
 
 
 @implementation ITPivotWindowEffect
 
 - (void)vanishFinish;
 @end
 
 
 @implementation ITPivotWindowEffect
 

+
+/*************************************************************************/
+#pragma mark -
+#pragma mark APPEAR METHODS
+/*************************************************************************/
+

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

-    [self setWindowVisibility:ITTransientStatusWindowAppearingState];
-    [self setPivot:315.0];
-    _effectProgress = 0.0;
-    [_window setAlphaValue:0.0];
+    __idle = NO;
+    
+    [self setWindowVisibility:ITWindowAppearingState];
+    [self performAppearFromProgress:0.0 effectTime:_effectTime];
+}
+
+- (void)performAppearFromProgress:(float)progress effectTime:(float)time
+{
+    [_window setEffectProgress: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
     [_window orderFront:self];
     _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
                                                     target:self


@@ -26,95 +48,135 @@
                                                    repeats:YES];
 }
 
                                                    repeats:YES];
 }
 

-- (void)performVanish
+- (void)appearStep

 {
 {

-    [self setWindowVisibility:ITTransientStatusWindowVanishingState];
-    [self setPivot:0.0];
-    _effectProgress = 1.0;
-    [_window setAlphaValue:1.0];
-    [_window orderFront:self];
-    _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
-                                                    target:self
-                                                  selector:@selector(vanishStep)
-                                                  userInfo:nil
-                                                   repeats:YES];
+    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];
+
+    if ( [_window effectProgress] >= 1.0 ) {
+        [self appearFinish];
+    }

 }
 
 }
 

-- (void)cancelAppear
+- (void)appearFinish

 {
 {

-    [self appearFinish];
-    [_window orderOut:self];
-    [self setPivot:0.0];
-    [_window setAlphaValue:1.0];
-    [self setWindowVisibility:ITTransientStatusWindowHiddenState];
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+    [self setWindowVisibility:ITWindowVisibleState];
+
+    __idle = YES;
+
+    if ( __shouldReleaseWhenIdle ) {
+        [self release];
+    }

 }
 
 }
 

-- (void)cancelVanish
+- (void)cancelAppear

 {
 {

-    [self vanishFinish];
-    [self setPivot:0.0];
-    [_window setAlphaValue:1.0];
-    [_window orderFront:self];
-    [_window display];
-    [self setWindowVisibility:ITTransientStatusWindowVisibleState];
+    [self setWindowVisibility:ITWindowVanishingState];
+
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+
+    [self performVanishFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];

 }
 
 }
 

-- (void)appearStep
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark VANISH METHODS
+/*************************************************************************/
+
+- (void)performVanish

 {
 {

-    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];
+    __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;
 }
 
 - (void)vanishStep
 {
     float interPivot = 1.0;

-    _effectProgress -= (1.0 / (EFFECT_FPS * _effectTime));
-    _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];
 
     [self setPivot:((interPivot * 45) + 315)];
     [_window setAlphaValue:interPivot];
 

-    if ( _effectProgress <= 0.0 ) {
+    if ( [_window effectProgress] <= 0.0 ) {

         [self vanishFinish];
     }
 }
 
         [self vanishFinish];
     }
 }
 

-- (void)appearFinish
+- (void)vanishFinish

 {
     [_effectTimer invalidate];
     _effectTimer = nil;
 {
     [_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;
     [_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));
 - (void)setPivot:(float)angle
 {
     float degAngle = (angle * (pi / 180));

+

     CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
     
  // Set pivot rotation point
     CGAffineTransform 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 );

 
     CGSSetWindowTransform([NSApp contextID],
                           (CGSWindowID)[_window windowNumber],
 
     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,
+                                                     -( [_window frame].origin.x - (32.0 + [[_window screen] visibleFrame].origin.x) ),
+                                                     -( [[_window screen] frame].size.height - ([_window frame].origin.y) + 32.0 + [[_window screen] visibleFrame].origin.y) ) );

 }
 
 
 }