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

[ITKit.git] / ITSlideVerticallyWindowEffect.m

diff --git a/ITSlideVerticallyWindowEffect.m b/ITSlideVerticallyWindowEffect.m
old mode 100755 (executable)
new mode 100644 (file)
index 6f2f47a..1f60933
--- a/ITSlideVerticallyWindowEffect.m
+++ b/ITSlideVerticallyWindowEffect.m
@@ -186,26 +186,20 @@
 - (void)setSlide:(float)distance
 {
     CGAffineTransform transform;
 - (void)setSlide:(float)distance
 {
     CGAffineTransform transform;

-    float xPoint;
+    NSPoint translation;
+       NSRect winFrame = [_window frame];

     
     

-    if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) {
-        xPoint = -( 32.0 + [[_window screen] visibleFrame].origin.x );
-    } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionRight ) {
-        xPoint = -(([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) - 32.0 - [_window frame].size.width);
-    } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionCenter ) {
-        xPoint = ( [_window frame].size.width - [[_window screen] visibleFrame].size.width ) / 2;
-    }
+    translation.x = -( [_window frame].origin.x );

     
     

-    /*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 );
-    }*/
+    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(xPoint,
-                                                 ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionTop ) ? ( [[_window screen] visibleFrame].origin.y - distance + 64.0 ) : -( [[_window screen] frame].size.height - ( distance + 32.0 + [[_window screen] visibleFrame].origin.y ) ) );
+    transform = CGAffineTransformMakeTranslation( translation.x, translation.y );

     
     CGSSetWindowTransform([NSApp contextID],
                           (CGSWindowID)[_window windowNumber],
     
     CGSSetWindowTransform([NSApp contextID],
                           (CGSWindowID)[_window windowNumber],