Huge audit of ITKit, mostly everything has been updated to current coding

[ITKit.git] / ITSlideHorizontallyWindowEffect.m

diff --git a/ITSlideHorizontallyWindowEffect.m b/ITSlideHorizontallyWindowEffect.m
old mode 100755 (executable)
new mode 100644 (file)
index ac302ff..60122fd
--- a/ITSlideHorizontallyWindowEffect.m
+++ b/ITSlideHorizontallyWindowEffect.m
@@ -17,6 +17,35 @@
 @implementation ITSlideHorizontallyWindowEffect
 
 
 @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
 /*************************************************************************/
 #pragma mark -
 #pragma mark APPEAR METHODS


@@ -137,7 +166,7 @@
     [self setSlide:0.0];
     [self setWindowVisibility:ITWindowHiddenState];
 
     [self setSlide:0.0];
     [self setWindowVisibility:ITWindowHiddenState];
 

-    __idle =YES;
+    __idle = YES;

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


@@ -156,11 +185,26 @@
 
 - (void)setSlide:(float)distance
 {
 
 - (void)setSlide:(float)distance
 {

-    CGAffineTransform transform = CGAffineTransformMakeTranslation((distance - 32.0),
-                                                                   -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0) ) );
-
+    CGAffineTransform transform;
+    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);
 }
     CGSSetWindowTransform([NSApp contextID],
                           (CGSWindowID)[_window windowNumber],
                           transform);
 }

+
+

 @end
 @end