Fixing the effects so they work on multiple monitors where the screen

[ITKit.git] / ITSpinWindowEffect.m

diff --git a/ITSpinWindowEffect.m b/ITSpinWindowEffect.m
index ad28792..ef8aaf6 100755 (executable)
--- a/ITSpinWindowEffect.m
+++ b/ITSpinWindowEffect.m
@@ -42,7 +42,7 @@
 
 + (unsigned int)listOrder
 {
 
 + (unsigned int)listOrder
 {

-    return 600;
+    return 700;

 }
 
 
 }
 
 


@@ -193,27 +193,27 @@
 
 - (void)setSpin:(float)progress
 {
 
 - (void)setSpin:(float)progress
 {

-    int hPos = [_window horizontalPosition];
+    //int hPos = [_window horizontalPosition];

     float radAngle = (progress * 4 * pi);
     CGAffineTransform transform;
     NSPoint translation;
     NSRect screenFrame = [[_window screen] frame];
     
     float radAngle = (progress * 4 * pi);
     CGAffineTransform transform;
     NSPoint translation;
     NSRect screenFrame = [[_window screen] 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 = /*screenFrame.origin.x + */([_window frame].size.width / 2.0);
+    translation.y = /*screenFrame.origin.y + */([_window frame].size.height / 2.0);

     transform = CGAffineTransformMakeTranslation(translation.x, translation.y);
     transform = CGAffineTransformRotate(transform, radAngle);
     transform = CGAffineTransformTranslate(transform, -translation.x, -translation.y);
     
     transform = CGAffineTransformMakeTranslation(translation.x, translation.y);
     transform = CGAffineTransformRotate(transform, radAngle);
     transform = CGAffineTransformTranslate(transform, -translation.x, -translation.y);
     

-    if (hPos == ITWindowPositionLeft) {
+    /*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.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 = -[_window frame].origin.x;
+    translation.y = -( screenFrame.size.height - [_window frame].origin.y - [_window frame].size.height );

     
     transform = CGAffineTransformTranslate(transform, translation.x, translation.y);
     CGSSetWindowTransform([NSApp contextID],
     
     transform = CGAffineTransformTranslate(transform, translation.x, translation.y);
     CGSSetWindowTransform([NSApp contextID],