X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/c514c1ffefd1a84c7df329864d2269e1ed05da6d..HEAD:/ITPivotWindowEffect.m

diff --git a/ITPivotWindowEffect.m b/ITPivotWindowEffect.m
old mode 100755
new mode 100644
index cf92f12..0d01e1f
--- a/ITPivotWindowEffect.m
+++ b/ITPivotWindowEffect.m
@@ -17,6 +17,35 @@
 @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
@@ -39,7 +68,7 @@
         [self setPivot:315.0];
         [_window setAlphaValue:0.0];
     }
-
+    
     [_window orderFront:self];
     _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
                                                     target:self
@@ -51,13 +80,17 @@
 - (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];
-
-    if ( [_window effectProgress] >= 1.0 ) {
+    
+    if ( progress >= 1.0 ) {
         [self appearFinish];
     }
 }
@@ -67,9 +100,9 @@
     [_effectTimer invalidate];
     _effectTimer = nil;
     [self setWindowVisibility:ITWindowVisibleState];
-
+    
     __idle = YES;
-
+    
     if ( __shouldReleaseWhenIdle ) {
         [self release];
     }
@@ -78,10 +111,10 @@
 - (void)cancelAppear
 {
     [self setWindowVisibility:ITWindowVanishingState];
-
+    
     [_effectTimer invalidate];
     _effectTimer = nil;
-
+    
     [self performVanishFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];
 }
 
@@ -107,7 +140,7 @@
         [self setPivot:0.0];
         [_window setAlphaValue:1.0];
     }
-
+    
     [_window orderFront:self];
     _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
                                                     target:self
@@ -119,13 +152,17 @@
 - (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);
-    [self setPivot:((interPivot * 45) + 315)];
+    [self setPivot:(315 + (interPivot * 45))];
     [_window setAlphaValue:interPivot];
-
-    if ( [_window effectProgress] <= 0.0 ) {
+    
+    if ( progress <= 0.0 ) {
         [self vanishFinish];
     }
 }
@@ -138,9 +175,9 @@
     [_window setAlphaValue:1.0];
     [self setPivot:0.0];
     [self setWindowVisibility:ITWindowHiddenState];
-
+    
     __idle = YES;
-
+    
     if ( __shouldReleaseWhenIdle ) {
         [self release];
     }
@@ -149,10 +186,10 @@
 - (void)cancelVanish
 {
     [self setWindowVisibility:ITWindowAppearingState];
-
+    
     [_effectTimer invalidate];
     _effectTimer = nil;
-
+    
     [self performAppearFromProgress:[_window effectProgress] effectTime:(_effectTime / 3.5)];
 }
 
@@ -164,52 +201,62 @@
 
 - (void)setPivot:(float)angle
 {
-    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));
+    int hPos = [_window horizontalPosition];
+    int vPos = [_window verticalPosition];
+	NSRect winFrame = [_window frame];
+
+    if ( (hPos == ITWindowPositionCenter) || (vPos == ITWindowPositionMiddle) ) {
+    
+        CGAffineTransform transform;
+        NSPoint translation;
+        
+        translation.x = -winFrame.origin.x;
+        translation.y = winFrame.origin.y + winFrame.size.height - [[NSScreen mainScreen] frame].size.height;
+
+        transform = CGAffineTransformMakeTranslation( translation.x, translation.y );
+        
+        CGSSetWindowTransform([NSApp contextID],
+                              (CGSWindowID)[_window windowNumber],
+                              transform);
+    } else {
+        float  degAngle;
+        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;
+            }
         }
-    } 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));
+        
+        degAngle  = (angle * (pi / 180));
+		transform = CGAffineTransformMakeRotation(degAngle);
+		
+		if ( vPos == ITWindowPositionBottom ) {
+            transform.ty = winFrame.size.height;
+        } else if ( vPos == ITWindowPositionTop ) {
+			transform.ty = 0;
         }
+        
+        if ( hPos == ITWindowPositionLeft ) {
+            transform.tx = 0;
+        } else if ( hPos == ITWindowPositionRight ) {
+			transform.tx = winFrame.size.width;
+        }
+		
+		transform = CGAffineTransformTranslate(transform, -winFrame.origin.x - transform.tx, winFrame.origin.y + winFrame.size.height - [[NSScreen mainScreen] frame].size.height - transform.ty);
+        CGSSetWindowTransform([NSApp contextID],
+                              (CGSWindowID)[_window windowNumber],
+							  transform );
     }
-    
-    transform = CGAffineTransformMakeRotation(degAngle);
-    
- // 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 );
-    
-    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,
-                                                     appearPoint.x,
-                                                     appearPoint.y ) );
 }
 
+
 @end