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

[ITKit.git] / ITSlideHorizontallyWindowEffect.m

diff --git a/ITSlideHorizontallyWindowEffect.m b/ITSlideHorizontallyWindowEffect.m
index 084211b..60122fd 100755 (executable)
--- a/ITSlideHorizontallyWindowEffect.m
+++ b/ITSlideHorizontallyWindowEffect.m
@@ -17,6 +17,35 @@
 @implementation ITSlideHorizontallyWindowEffect
 
 
++ (NSString *)effectName
+{
+    return @"Slide Horizontally";
+}
+
++ (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:YES], @"Left",
+            [NSNumber numberWithBool:NO], @"Center",
+            [NSNumber numberWithBool:YES], @"Right", nil] , @"Middle" ,
+        [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithBool:YES], @"Left",
+            [NSNumber numberWithBool:NO], @"Center",
+            [NSNumber numberWithBool:YES], @"Right", nil] , @"Bottom" , nil];
+}
+
+
++ (unsigned int)listOrder
+{
+    return 400;
+}
+
+
 /*************************************************************************/
 #pragma mark -
 #pragma mark APPEAR METHODS
@@ -157,18 +186,25 @@
 - (void)setSlide:(float)distance
 {
     CGAffineTransform transform;
-    if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) {
-        NSLog(@"%f", (distance - (32.0 + [[_window screen] visibleFrame].origin.x)));
-        transform = CGAffineTransformMakeTranslation((distance - (32.0 + [[_window screen] visibleFrame].origin.x)),
-                                                    -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ) );
-    } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionRight ) {
-        NSLog(@"%f", [[_window screen] visibleFrame].size.width - ([_window frame].size.width - distance));
-        transform = CGAffineTransformMakeTranslation((32.0 - (([[_window screen] visibleFrame].size.width / 2) + distance)),
-                                                    -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ) );
+    NSPoint translation;
+    NSRect winFrame = [_window frame];
+       
+    if ( [_window horizontalPosition] == ITWindowPositionLeft ) {
+        translation.x = ( -(winFrame.origin.x) + distance ) ;
+    } else if ( [_window horizontalPosition] == ITWindowPositionRight ) {
+        translation.x = ( -(winFrame.origin.x) - distance ) ;
+    } else {
+        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);
 }
+
+
 @end