X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/bd40b798b6a46cfecdfb128e2992bba254148911..fc20fb5991f57d35d0483a29d8a4c8f7775e7969:/ITSlideVerticallyWindowEffect.m diff --git a/ITSlideVerticallyWindowEffect.m b/ITSlideVerticallyWindowEffect.m index 389583f..023e276 100755 --- a/ITSlideVerticallyWindowEffect.m +++ b/ITSlideVerticallyWindowEffect.m @@ -156,8 +156,27 @@ - (void)setSlide:(float)distance { - CGAffineTransform transform = CGAffineTransformMakeTranslation( -( 32.0 + [[_window screen] visibleFrame].origin.x ), - -( [[_window screen] frame].size.height - ( distance + 32.0 + [[_window screen] visibleFrame].origin.y ) ) ); + CGAffineTransform transform; + float xPoint; + + 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; + } + + /*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 ); + }*/ + + 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 ) ) ); CGSSetWindowTransform([NSApp contextID], (CGSWindowID)[_window windowNumber],