Positioning Fixes. The window might still do some weirdness if you change its positi...

[ITKit.git] / ITPivotWindowEffect.m

diff --git a/ITPivotWindowEffect.m b/ITPivotWindowEffect.m
index 81a4b5c..373c5f3 100755 (executable)
--- a/ITPivotWindowEffect.m
+++ b/ITPivotWindowEffect.m
@@ -17,6 +17,35 @@
 @implementation ITPivotWindowEffect
 
 
 @implementation ITPivotWindowEffect
 
 

++ (NSString *)effectName
+{
+    return @"Pivot";
+}
+
++ (NSDictionary *)supportedPositions
+{
+    return [NSDictionary dictionaryWithObjectsAndKeys:
+        [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithBool:YES], @"Left",
+            [NSNumber numberWithBool:NO], @"Center",
+            [NSNumber numberWithBool:YES], @"Right", nil] , @"Top" ,
+        [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithBool:NO], @"Left",
+            [NSNumber numberWithBool:NO], @"Center",
+            [NSNumber numberWithBool:NO], @"Right", nil] , @"Middle" ,
+        [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithBool:YES], @"Left",
+            [NSNumber numberWithBool:NO], @"Center",
+            [NSNumber numberWithBool:YES], @"Right", nil] , @"Bottom" , nil];
+}
+
+
++ (unsigned int)listOrder
+{
+    return 500;
+}
+
+

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


@@ -39,7 +68,7 @@
         [self setPivot:315.0];
         [_window setAlphaValue: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


@@ -51,13 +80,17 @@
 - (void)appearStep
 {
     float interPivot = 0.0;
 - (void)appearStep
 {
     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)];
+    float progress   = ([_window effectProgress] + _effectSpeed);
+    
+    progress = ( (progress < 1.0) ? progress : 1.0 );
+    
+    [_window setEffectProgress:progress];
+    
+    interPivot = (( sin((progress * pi) - (pi / 2)) + 1 ) / 2);
+    [self setPivot:(315 + (interPivot * 45))];

     [_window setAlphaValue:interPivot];
     [_window setAlphaValue:interPivot];

-
-    if ( [_window effectProgress] >= 1.0 ) {
+    
+    if ( progress >= 1.0 ) {

         [self appearFinish];
     }
 }
         [self appearFinish];
     }
 }


@@ -67,9 +100,9 @@
     [_effectTimer invalidate];
     _effectTimer = nil;
     [self setWindowVisibility:ITWindowVisibleState];
     [_effectTimer invalidate];
     _effectTimer = nil;
     [self setWindowVisibility:ITWindowVisibleState];

-
+    

     __idle = YES;
     __idle = YES;

-
+    

     if ( __shouldReleaseWhenIdle ) {
         [self release];
     }
     if ( __shouldReleaseWhenIdle ) {
         [self release];
     }


@@ -78,10 +111,10 @@
 - (void)cancelAppear
 {
     [self setWindowVisibility:ITWindowVanishingState];
 - (void)cancelAppear
 {
     [self setWindowVisibility:ITWindowVanishingState];

-
+    

     [_effectTimer invalidate];
     _effectTimer = nil;
     [_effectTimer invalidate];
     _effectTimer = nil;

-
+    

     [self performVanishFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];
 }
 
     [self performVanishFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];
 }
 


@@ -107,7 +140,7 @@
         [self setPivot:0.0];
         [_window setAlphaValue:1.0];
     }
         [self setPivot:0.0];
         [_window setAlphaValue:1.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


@@ -119,13 +152,17 @@
 - (void)vanishStep
 {
     float interPivot = 1.0;
 - (void)vanishStep
 {
     float interPivot = 1.0;

-    [_window setEffectProgress:([_window effectProgress] - _effectSpeed)];
-    [_window setEffectProgress:( ([_window effectProgress] > 0.0) ? [_window effectProgress] : 0.0)];
+    float progress   = ([_window effectProgress] - _effectSpeed);
+    
+    progress = ( (progress > 0.0) ? progress : 0.0);
+    
+    [_window setEffectProgress:progress];
+    

     interPivot = (( sin(([_window effectProgress] * pi) - (pi / 2)) + 1 ) / 2);
     interPivot = (( sin(([_window effectProgress] * pi) - (pi / 2)) + 1 ) / 2);

-    [self setPivot:((interPivot * 45) + 315)];
+    [self setPivot:(315 + (interPivot * 45))];

     [_window setAlphaValue:interPivot];
     [_window setAlphaValue:interPivot];

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

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


@@ -138,9 +175,9 @@
     [_window setAlphaValue:1.0];
     [self setPivot:0.0];
     [self setWindowVisibility:ITWindowHiddenState];
     [_window setAlphaValue:1.0];
     [self setPivot:0.0];
     [self setWindowVisibility:ITWindowHiddenState];

-
+    

     __idle = YES;
     __idle = YES;

-
+    

     if ( __shouldReleaseWhenIdle ) {
         [self release];
     }
     if ( __shouldReleaseWhenIdle ) {
         [self release];
     }


@@ -149,10 +186,10 @@
 - (void)cancelVanish
 {
     [self setWindowVisibility:ITWindowAppearingState];
 - (void)cancelVanish
 {
     [self setWindowVisibility:ITWindowAppearingState];

-
+    

     [_effectTimer invalidate];
     _effectTimer = nil;
     [_effectTimer invalidate];
     _effectTimer = nil;

-
+    

     [self performAppearFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];
 }
 
     [self performAppearFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];
 }
 


@@ -164,19 +201,70 @@
 
 - (void)setPivot:(float)angle
 {
 
 - (void)setPivot:(float)angle
 {

-    float degAngle = (angle * (pi / 180));
+    int hPos = [_window horizontalPosition];
+    int vPos = [_window verticalPosition];

 
 

-    CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
+    if ( (hPos == ITWindowPositionCenter) || (vPos == ITWindowPositionMiddle) ) {

     
     

- // Set pivot rotation point
-    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 + [[_window screen] visibleFrame].origin.x) ),
-                                                     -( [[_window screen] frame].size.height - ([_window frame].origin.y) + 32.0 + [[_window screen] visibleFrame].origin.y) ) );
+        CGAffineTransform transform;
+        NSPoint translation;
+        
+        translation.x = ( -([_window frame].origin.x) ) ;
+        translation.y = -( [[_window screen] frame].size.height - [_window frame].origin.y - [_window frame].size.height );
+
+        transform = CGAffineTransformMakeTranslation( translation.x, translation.y );
+        
+        CGSSetWindowTransform([NSApp contextID],
+                              (CGSWindowID)[_window windowNumber],
+                              transform);
+    } else {
+        
+        float  degAngle;
+        NSRect windowFrame = [_window frame];
+        NSRect screenFrame = [[_window screen] frame];
+        float  translateX;
+        float  translateY;
+        CGAffineTransform transform;
+        
+        if ( vPos == ITWindowPositionBottom ) {
+            if ( hPos == ITWindowPositionLeft ) {
+                angle = angle;
+            } else if ( hPos == ITWindowPositionRight ) {
+                angle = ( 45 - -(315 - angle) );
+            }
+        } else if ( vPos == ITWindowPositionTop ) {
+            if ( hPos == ITWindowPositionLeft ) {
+                angle = ( 45 - -(315 - angle) );
+            } else if ( hPos == ITWindowPositionRight ) {
+                angle = angle;
+            }
+        }
+        
+        degAngle  = (angle * (pi / 180));
+        transform = CGAffineTransformMakeRotation(degAngle);
+        
+        if ( vPos == ITWindowPositionBottom ) {
+            transform.ty = ( windowFrame.size.height + windowFrame.origin.y);
+            translateY   = -(screenFrame.size.height);
+        } else if ( vPos == ITWindowPositionTop ) {
+            transform.ty = -( screenFrame.size.height - windowFrame.origin.y - windowFrame.size.height );
+            translateY   = 0;
+        }
+        
+        if ( hPos == ITWindowPositionLeft ) {
+            transform.tx = -( windowFrame.origin.x );
+            translateX   = 0;
+        } else if ( hPos == ITWindowPositionRight ) {
+            transform.tx = ( screenFrame.size.width - windowFrame.origin.x );
+            translateX   = -(screenFrame.size.width);
+        }
+        
+        CGSSetWindowTransform([NSApp contextID],
+                              (CGSWindowID)[_window windowNumber],
+                              CGAffineTransformTranslate( transform,
+                                                          translateX,
+                                                          translateY ) );
+    }

 }
 
 
 }