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

[ITKit.git] / ITSpinWindowEffect.m

diff --git a/ITSpinWindowEffect.m b/ITSpinWindowEffect.m
index b3137bf..0de4f56 100755 (executable)
--- a/ITSpinWindowEffect.m
+++ b/ITSpinWindowEffect.m
@@ -42,7 +42,7 @@
 
 + (unsigned int)listOrder
 {
-    return 600;
+    return 700;
 }
 
 
@@ -193,31 +193,21 @@
 
 - (void)setSpin:(float)progress
 {
-    int hPos = [_window horizontalPosition];
     float radAngle = (progress * 4 * pi);
     CGAffineTransform transform;
     NSPoint translation;
-    NSRect screenFrame = [[_window screen] frame];
+    NSRect winFrame = [_window frame];
     
-    translation.x = screenFrame.origin.x + ([_window frame].size.width / 2.0);
-    translation.y = screenFrame.origin.y + ([_window frame].size.height / 2.0);
+    translation.x = (winFrame.size.width / 2.0);
+    translation.y = (winFrame.size.height / 2.0);
     transform = CGAffineTransformMakeTranslation(translation.x, translation.y);
     transform = CGAffineTransformRotate(transform, radAngle);
-    //transform = CGAffineTransformScale(transform, 1.0 / progress, 1.0 / progress);
     transform = CGAffineTransformTranslate(transform, -translation.x, -translation.y);
     
-    if (hPos == ITWindowPositionLeft) {
-        translation.x = -[_window frame].origin.x;
-    } else if (hPos == ITWindowPositionRight) {
-        translation.x = -[_window frame].origin.x;
-    } else {
-        translation.x = -[_window frame].origin.x;
-    }
-    
-    translation.y = -( [[_window screen] frame].size.height - [_window frame].origin.y - [_window frame].size.height );
+    translation.x = -winFrame.origin.x;
+    translation.y = winFrame.origin.y + winFrame.size.height - [[NSScreen mainScreen] frame].size.height;
     
     transform = CGAffineTransformTranslate(transform, translation.x, translation.y);
-    
     CGSSetWindowTransform([NSApp contextID],
                           (CGSWindowID)[_window windowNumber],
                           transform);