From: Kent Sutherland Date: Thu, 13 Nov 2003 21:25:47 +0000 (+0000) Subject: Added sliding in from all four corners both horizontal and vertical. X-Git-Tag: v0.1~17 X-Git-Url: http://git.ithinksw.org/ITKit.git/commitdiff_plain/01db0767091e20e5515fae009a07a6fd8535bcdf Added sliding in from all four corners both horizontal and vertical. --- diff --git a/ITSlideHorizontallyWindowEffect.m b/ITSlideHorizontallyWindowEffect.m index 148e2e8..4de74ec 100755 --- a/ITSlideHorizontallyWindowEffect.m +++ b/ITSlideHorizontallyWindowEffect.m @@ -159,10 +159,10 @@ CGAffineTransform transform; if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) { transform = CGAffineTransformMakeTranslation((distance - (32.0 + [[_window screen] visibleFrame].origin.x)), - -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ) ); + ( [(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), - -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ) ); + ( [(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 ) ); } CGSSetWindowTransform([NSApp contextID], diff --git a/ITSlideVerticallyWindowEffect.m b/ITSlideVerticallyWindowEffect.m index 389583f..140ffbd 100755 --- a/ITSlideVerticallyWindowEffect.m +++ b/ITSlideVerticallyWindowEffect.m @@ -156,8 +156,14 @@ - (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; + 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 ); + } CGSSetWindowTransform([NSApp contextID], (CGSWindowID)[_window windowNumber], diff --git a/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib b/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib index 0dcb82d..a1dab2a 100755 Binary files a/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib and b/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib differ