The dissolve, cut and slides all work properly now, I hope :D

[ITKit.git] / ITCutWindowEffect.m

diff --git a/ITCutWindowEffect.m b/ITCutWindowEffect.m
index a42fcc8..8ab95cd 100755 (executable)
--- a/ITCutWindowEffect.m
+++ b/ITCutWindowEffect.m
@@ -1,6 +1,6 @@
 #import "ITCutWindowEffect.h"
 #import "ITTransientStatusWindow.h"
-
+#import "ITCoreGraphicsHacks.h"
 
 @implementation ITCutWindowEffect
 
@@ -12,8 +12,33 @@
 
 - (void)performAppear
 {
+    CGAffineTransform transform;
+    NSPoint appearPoint;
+    
+    //Set the location on the screen
+    if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) {
+        appearPoint.x = -( 32.0 + [[_window screen] visibleFrame].origin.x );
+    } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionRight ) {
+        appearPoint.x = -(([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) - 32.0 - [_window frame].size.width);
+    } 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 = ( 64.0 + [[_window screen] visibleFrame].origin.y - [_window frame].size.height );
+    } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) {
+        appearPoint.y = -( [[_window screen] frame].size.height - ( [_window frame].size.height + 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;
+    }
+    
+    transform = CGAffineTransformMakeTranslation(appearPoint.x, appearPoint.y);
+    CGSSetWindowTransform([NSApp contextID],
+                          (CGSWindowID)[_window windowNumber],
+                          transform);
+    
     [_window orderFront:self];
-    [self setWindowVisibility:ITTransientStatusWindowVisibleState];
+    [self setWindowVisibility:ITWindowVisibleState];
 }
 
 - (void)cancelAppear
@@ -30,7 +55,7 @@
 - (void)performVanish
 {
     [_window orderOut:self];
-    [self setWindowVisibility:ITTransientStatusWindowHiddenState];
+    [self setWindowVisibility:ITWindowHiddenState];
 }
 
 - (void)cancelVanish