Fixed multi-monitorness except with Pivot, which is only half fixed.

[ITKit.git] / ITSlideVerticallyWindowEffect.m

diff --git a/ITSlideVerticallyWindowEffect.m b/ITSlideVerticallyWindowEffect.m
index 140ffbd..1f60933 100755 (executable)
--- a/ITSlideVerticallyWindowEffect.m
+++ b/ITSlideVerticallyWindowEffect.m
@@ -17,6 +17,35 @@
 @implementation ITSlideVerticallyWindowEffect
 
 
 @implementation ITSlideVerticallyWindowEffect
 
 

++ (NSString *)effectName
+{
+    return @"Slide Vertically";
+}
+
++ (NSDictionary *)supportedPositions
+{
+    return [NSDictionary dictionaryWithObjectsAndKeys:
+        [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithBool:YES], @"Left",
+            [NSNumber numberWithBool:YES], @"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:YES], @"Center",
+            [NSNumber numberWithBool:YES], @"Right", nil] , @"Bottom" , nil];
+}
+
+
++ (unsigned int)listOrder
+{
+    return 300;
+}
+
+

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


@@ -157,14 +186,21 @@
 - (void)setSlide:(float)distance
 {
     CGAffineTransform transform;
 - (void)setSlide:(float)distance
 {
     CGAffineTransform transform;

-    if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) {
-        transform = CGAffineTransformMakeTranslation( ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) ? -( 32.0 + [[_window screen] visibleFrame].origin.x ) : -(([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) - 32.0 - [_window frame].size.width),
-                                                    -( [[_window screen] frame].size.height - ( distance + 32.0 + [[_window screen] visibleFrame].origin.y ) ) );
-    } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionTop ) {
-        transform = CGAffineTransformMakeTranslation( ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) ? -( 32.0 + [[_window screen] visibleFrame].origin.x ) : -(([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) - 32.0 - [_window frame].size.width),
-                                                    [[_window screen] visibleFrame].origin.y - distance + 64.0 );
+    NSPoint translation;
+       NSRect winFrame = [_window frame];
+    
+    translation.x = -( [_window frame].origin.x );
+    
+    if ( [_window verticalPosition] == ITWindowPositionTop ) {
+               translation.y = (winFrame.size.height * 2) - ([[NSScreen mainScreen] frame].size.height - winFrame.origin.y) - distance;
+    } else if ( [_window verticalPosition] == ITWindowPositionBottom ) {
+        translation.y = winFrame.origin.y + distance - [[NSScreen mainScreen] frame].size.height;
+    } else {
+        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);
     CGSSetWindowTransform([NSApp contextID],
                           (CGSWindowID)[_window windowNumber],
                           transform);