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

[ITKit.git] / ITPivotWindowEffect.m

diff --git a/ITPivotWindowEffect.m b/ITPivotWindowEffect.m
index 95c1040..81a4b5c 100755 (executable)
--- a/ITPivotWindowEffect.m
+++ b/ITPivotWindowEffect.m
@@ -24,7 +24,9 @@
 
 - (void)performAppear
 {
-    [self setWindowVisibility:ITTransientStatusWindowAppearingState];
+    __idle = NO;
+    
+    [self setWindowVisibility:ITWindowAppearingState];
     [self performAppearFromProgress:0.0 effectTime:_effectTime];
 }
 
@@ -64,12 +66,18 @@
 {
     [_effectTimer invalidate];
     _effectTimer = nil;
-    [self setWindowVisibility:ITTransientStatusWindowVisibleState];
+    [self setWindowVisibility:ITWindowVisibleState];
+
+    __idle = YES;
+
+    if ( __shouldReleaseWhenIdle ) {
+        [self release];
+    }
 }
 
 - (void)cancelAppear
 {
-    [self setWindowVisibility:ITTransientStatusWindowVanishingState];
+    [self setWindowVisibility:ITWindowVanishingState];
 
     [_effectTimer invalidate];
     _effectTimer = nil;
@@ -85,7 +93,9 @@
 
 - (void)performVanish
 {
-    [self setWindowVisibility:ITTransientStatusWindowVanishingState];
+    __idle = NO;
+    
+    [self setWindowVisibility:ITWindowVanishingState];
     [self performVanishFromProgress:1.0 effectTime:_effectTime];
 }
 
@@ -126,12 +136,19 @@
     _effectTimer = nil;
     [_window orderOut:self];
     [_window setAlphaValue:1.0];
-    [self setWindowVisibility:ITTransientStatusWindowHiddenState];
+    [self setPivot:0.0];
+    [self setWindowVisibility:ITWindowHiddenState];
+
+    __idle = YES;
+
+    if ( __shouldReleaseWhenIdle ) {
+        [self release];
+    }
 }
 
 - (void)cancelVanish
 {
-    [self setWindowVisibility:ITTransientStatusWindowAppearingState];
+    [self setWindowVisibility:ITWindowAppearingState];
 
     [_effectTimer invalidate];
     _effectTimer = nil;
@@ -152,14 +169,14 @@
     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],
-                          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) ) );
 }