X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/e873f11d0bb398c460817aa1dd4061572f5a1d09..26e65c9481bae3ff6a80687f74deb76da9ccdbee:/ITSlideHorizontallyWindowEffect.m diff --git a/ITSlideHorizontallyWindowEffect.m b/ITSlideHorizontallyWindowEffect.m index ac302ff..2382cc4 100755 --- a/ITSlideHorizontallyWindowEffect.m +++ b/ITSlideHorizontallyWindowEffect.m @@ -137,7 +137,7 @@ [self setSlide:0.0]; [self setWindowVisibility:ITWindowHiddenState]; - __idle =YES; + __idle = YES; if ( __shouldReleaseWhenIdle ) { [self release]; @@ -156,9 +156,28 @@ - (void)setSlide:(float)distance { - CGAffineTransform transform = CGAffineTransformMakeTranslation((distance - 32.0), - -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0) ) ); - + CGAffineTransform transform; + float yPoint; + + if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionTop ) { + yPoint = ( 64.0 + [[_window screen] visibleFrame].origin.y - [_window frame].size.height ); + } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) { + yPoint = -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ); + } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionMiddle ) { + yPoint = ( [_window frame].size.height - [[_window screen] visibleFrame].size.height) / 2; + } + + /*if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) { + transform = CGAffineTransformMakeTranslation((distance - (32.0 + [[_window screen] visibleFrame].origin.x)), + ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) ? -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ) : ( 64.0 + [[_window screen] visibleFrame].origin.y - [_window frame].size.height ) ); + } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionRight ) { + transform = CGAffineTransformMakeTranslation(-((([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) + distance) - 32.0 - [_window frame].size.width), + ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) ? -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ) : ( 64.0 + [[_window screen] visibleFrame].origin.y - [_window frame].size.height ) ); + }*/ + + transform = CGAffineTransformMakeTranslation( ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) ? (distance - (32.0 + [[_window screen] visibleFrame].origin.x)) : -((([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) + distance) - 32.0 - [_window frame].size.width), + yPoint); + CGSSetWindowTransform([NSApp contextID], (CGSWindowID)[_window windowNumber], transform);