X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/9ca04accfdeca9935e89bad1137941cfee16be9b..676d1feebedb6b04b4da4bb58b3ca1282d7740f5:/ITSpinAndZoomWindowEffect.m diff --git a/ITSpinAndZoomWindowEffect.m b/ITSpinAndZoomWindowEffect.m index cbbf44c..44b3ad3 100755 --- a/ITSpinAndZoomWindowEffect.m +++ b/ITSpinAndZoomWindowEffect.m @@ -193,28 +193,20 @@ - (void)setScale:(float)scale angle:(float)angle { - //int hPos = [_window horizontalPosition]; float radAngle = (angle * 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); + NSRect winFrame = [_window frame]; + + translation.x = (winFrame.size.width / 2.0); + translation.y = (winFrame.size.height / 2.0); transform = CGAffineTransformMakeTranslation(translation.x, translation.y); transform = CGAffineTransformScale(transform, 1.0 / scale, 1.0 / scale); transform = CGAffineTransformRotate(transform, radAngle); 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.x = -[_window frame].origin.x; - translation.y = -( screenFrame.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],