X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/22a86e1af594d77fde7f056cf5152478f14dafbf..1de0d30d4a40f983a45b41ce98f297bbe435ef24:/ITTransientStatusWindow.m?ds=inline diff --git a/ITTransientStatusWindow.m b/ITTransientStatusWindow.m index 4182d57..c47f9af 100755 --- a/ITTransientStatusWindow.m +++ b/ITTransientStatusWindow.m @@ -1,18 +1,11 @@ #import "ITTransientStatusWindow.h" -#import +#import "ITWindowEffect.h" +#import #import "ITCoreGraphicsHacks.h" #import "ITTextField.h" -#import "ITGrayRoundedView.h" +#import "ITTSWBackgroundView.h" - -/*************************************************************************/ -#pragma mark - -#pragma mark EVIL HACKERY -/*************************************************************************/ - -@interface NSApplication (HACKHACKHACKHACK) -- (CGSConnectionID)contextID; -@end +#define EFFECT_FPS 30.0 /*************************************************************************/ @@ -25,10 +18,8 @@ exitMode:(ITTransientStatusWindowExitMode)exitMode backgroundType:(ITTransientStatusWindowBackgroundType)backgroundType; - (void)rebuildWindow; -- (void)performEffect; -- (void)dissolveEffect:(BOOL)entering; -- (void)slideVerticalEffect:(BOOL)entering; -- (void)slideHorizontalEffect:(BOOL)entering; +- (void)startVanishTimer; +- (void)stopVanishTimer; @end @@ -69,10 +60,7 @@ static ITTransientStatusWindow *staticWindow = nil; { NSRect contentRect; - CGSValueObj key; - CGSValueObj ignore; - - // If no Content View was provided, use a generic NSImageView with the app icon. + // If no Content View was provided, use a generic view. if ( ! (contentView) ) { contentView = [[[NSView alloc] initWithFrame: NSMakeRect(100.0, 100.0, 200.0, 200.0)] autorelease]; @@ -86,34 +74,26 @@ static ITTransientStatusWindow *staticWindow = nil; backing:NSBackingStoreBuffered defer:NO] ) ) { - _visibilityState = ITTransientStatusWindowHiddenState; - _exitMode = exitMode; - _exitDelay = DEFAULT_EXIT_DELAY; - _backgroundType = backgroundType; - _verticalPosition = ITTransientStatusWindowPositionBottom; - _horizontalPosition = ITTransientStatusWindowPositionLeft; - _entryEffect = ITTransientStatusWindowEffectNone; - _exitEffect = ITTransientStatusWindowEffectDissolve; - - _delayTimer = nil; - _fadeTimer = nil; - -// if ( _backgroundType == ITTransientStatusWindowRounded ) { -// _contentSubView = contentView; -// } else { -// [self setContentView:contentView]; -// } - -// [self setIgnoresMouseEvents:YES]; - - key = CGSCreateCString("IgnoreForEvents"); - ignore = CGSCreateBoolean(kCGSTrue); - - CGSSetWindowProperty([NSApp contextID], (CGSWindowID)[self windowNumber], key, ignore); - - CGSReleaseObj(key); - CGSReleaseObj(ignore); - + _visibilityState = ITWindowHiddenState; + _exitMode = exitMode; + _exitDelay = DEFAULT_EXIT_DELAY; + _backgroundType = backgroundType; + _verticalPosition = ITWindowPositionBottom; + _horizontalPosition = ITWindowPositionLeft; + _screenPadding = 32.0; + //_screenNumber = 0; + _entryEffect = nil; + _exitEffect = nil; + _reallyIgnoresEvents = YES; + _exitTimer = nil; + +// if ( _backgroundType == ITTransientStatusWindowRounded ) { +// _contentSubView = contentView; +// } else { +// [self setContentView:contentView]; +// } + + [self setIgnoresMouseEvents:YES]; [self setLevel:NSScreenSaverWindowLevel]; [self setContentView:contentView]; [self rebuildWindow]; @@ -127,42 +107,26 @@ static ITTransientStatusWindow *staticWindow = nil; #pragma mark INSTANCE METHODS /*************************************************************************/ -- (void)orderFront:(id)sender +- (BOOL)ignoresMouseEvents { - if ( _exitMode = ITTransientStatusWindowExitAfterDelay ) { - // set the timer, and orderOut: when it lapses. - } - - if ( _entryEffect == ITTransientStatusWindowEffectNone ) { - [super orderFront:sender]; - } else { - [self performEffect]; - } + return _reallyIgnoresEvents; } -- (void)makeKeyAndOrderFront:(id)sender +- (void)setIgnoresMouseEvents:(BOOL)flag { - if ( _exitMode = ITTransientStatusWindowExitAfterDelay ) { - // set the timer, and orderOut: when it lapses. - } + CGSValueObj key; + CGSValueObj ignore; - if ( _entryEffect == ITTransientStatusWindowEffectNone ) { - [super makeKeyAndOrderFront:sender]; - } else { - [self performEffect]; - [self makeKeyWindow]; - } -} + key = CGSCreateCString("IgnoreForEvents"); + ignore = CGSCreateBoolean( (flag ? kCGSTrue : kCGSFalse) ); + CGSSetWindowProperty([NSApp contextID], (CGSWindowID)[self windowNumber], key, ignore); + CGSReleaseObj(key); + CGSReleaseObj(ignore); -- (void)orderOut:(id)sender -{ - if ( _entryEffect == ITTransientStatusWindowEffectNone ) { - [super orderOut:sender]; - } else { - [self performEffect]; - } + _reallyIgnoresEvents = flag; } + /* - (id)contentView @@ -189,12 +153,54 @@ static ITTransientStatusWindow *staticWindow = nil; */ -- (ITTransientStatusWindowVisibilityState)visibilityState +- (IBAction)appear:(id)sender +{ + if ( _visibilityState == ITWindowHiddenState ) { + // Window is hidden. Appear as normal, and start the timer. + [_entryEffect performAppear]; + } else if ( _visibilityState == ITWindowVisibleState ) { + // Window is completely visible. Simply reset the timer. + [self startVanishTimer]; + } else if ( _visibilityState == ITWindowAppearingState ) { + // Window is on its way in. Do nothing. + } else if ( _visibilityState == ITWindowVanishingState ) { + // Window is on its way out. Cancel the vanish. + [_exitEffect cancelVanish]; + } +} + +- (IBAction)vanish:(id)sender +{ + if ( _visibilityState == ITWindowVisibleState ) { + // Window is totally visible. Perform exit effect. + [_exitEffect performVanish]; + } else if ( _visibilityState == ITWindowHiddenState ) { + // Window is hidden. Do nothing. + } else if ( _visibilityState == ITWindowAppearingState ) { + // Window is on its way in. Cancel appear. + [_entryEffect cancelAppear]; + } else if ( _visibilityState == ITWindowVanishingState ) { + // Window is on its way out. Do nothing. + } +} + +- (ITWindowVisibilityState)visibilityState { return _visibilityState; } -- (ITTransientStatusWindowExitMode)ExitMode +- (void)setVisibilityState:(ITWindowVisibilityState)newState +{ + _visibilityState = newState; + + if ( _visibilityState == ITWindowVisibleState ) { + [self startVanishTimer]; + } else if ( (_visibilityState == ITWindowVanishingState) || (_visibilityState == ITWindowHiddenState) ) { + [self stopVanishTimer]; + } +} + +- (ITTransientStatusWindowExitMode)exitMode { return _exitMode; } @@ -202,6 +208,14 @@ static ITTransientStatusWindow *staticWindow = nil; - (void)setExitMode:(ITTransientStatusWindowExitMode)newMode { _exitMode = newMode; + + if ( _visibilityState == ITWindowVisibleState ) { + if ( _exitMode == ITTransientStatusWindowExitOnCommand ) { + [self stopVanishTimer]; + } else if ( _exitMode == ITTransientStatusWindowExitAfterDelay ) { + [self startVanishTimer]; + } + } } - (float)exitDelay @@ -227,44 +241,76 @@ static ITTransientStatusWindow *staticWindow = nil; _backgroundType = ITTransientStatusWindowRounded; } -- (ITTransientStatusWindowPosition)verticalPosition; +- (ITVerticalWindowPosition)verticalPosition; { return _verticalPosition; } -- (void)setVerticalPosition:(ITTransientStatusWindowPosition)newPosition; +- (void)setVerticalPosition:(ITVerticalWindowPosition)newPosition; { _verticalPosition = newPosition; } -- (ITTransientStatusWindowPosition)horizontalPosition; +- (ITHorizontalWindowPosition)horizontalPosition; { return _horizontalPosition; } -- (void)setHorizontalPosition:(ITTransientStatusWindowPosition)newPosition; +- (void)setHorizontalPosition:(ITHorizontalWindowPosition)newPosition; { _horizontalPosition = newPosition; } -- (ITTransientStatusWindowEffect)entryEffect +- (float)effectProgress +{ + return _effectProgress; +} + +- (void)setEffectProgress:(float)newProgress +{ + _effectProgress = newProgress; +} + +- (float)screenPadding +{ + return _screenPadding; +} + +- (void)setScreenPadding:(float)newPadding +{ + _screenPadding = newPadding; +} + +/*- (int)screenNumber +{ + return _screenNumber; +} + +- (void)setScreenNumber:(int)newNumber +{ + _screenNumber = newNumber; +}*/ + +- (ITWindowEffect *)entryEffect { return _entryEffect; } -- (void)setEntryEffect:(ITTransientStatusWindowEffect)newEffect; +- (void)setEntryEffect:(ITWindowEffect *)newEffect { - _entryEffect = newEffect; + [_entryEffect releaseWhenIdle]; + _entryEffect = [newEffect retain]; } -- (ITTransientStatusWindowEffect)exitEffect; +- (ITWindowEffect *)exitEffect { return _exitEffect; } -- (void)setExitEffect:(ITTransientStatusWindowEffect)newEffect; +- (void)setExitEffect:(ITWindowEffect *)newEffect { - _exitEffect = newEffect; + [_exitEffect releaseWhenIdle]; + _exitEffect = [newEffect retain]; } @@ -276,7 +322,7 @@ static ITTransientStatusWindow *staticWindow = nil; - (void)rebuildWindow; { if ( _backgroundType == ITTransientStatusWindowRounded ) { - ITGrayRoundedView *roundedView = [[[ITGrayRoundedView alloc] initWithFrame:[self frame]] autorelease]; + ITTSWBackgroundView *roundedView = [[[ITTSWBackgroundView alloc] initWithFrame:[self frame]] autorelease]; [self setBackgroundColor:[NSColor clearColor]]; [self setHasShadow:NO]; @@ -291,42 +337,30 @@ static ITTransientStatusWindow *staticWindow = nil; } } -- (void)performEffect +- (void)startVanishTimer { - if ( _visibilityState == ITTransientStatusWindowHiddenState ) { - if ( _entryEffect == ITTransientStatusWindowEffectDissolve ) { - [self dissolveEffect:YES]; - } else if ( _entryEffect == ITTransientStatusWindowEffectSlideVertically ) { - [self slideEffect:YES]; - } else if ( _entryEffect == ITTransientStatusWindowEffectSlideHorizontally ) { - [self slideEffect:YES]; - } - } else if ( _visibilityState == ITTransientStatusWindowVisibleState ) { - if ( _exitEffect == ITTransientStatusWindowEffectDissolve ) { - [self dissolveEffect:NO]; - } else if ( _exitEffect == ITTransientStatusWindowEffectSlideVertically ) { - [self slideEffect:NO]; - } else if ( _exitEffect == ITTransientStatusWindowEffectSlideHorizontally ) { - [self slideEffect:NO]; - } + if ( _exitMode == ITTransientStatusWindowExitAfterDelay) { + [self stopVanishTimer]; + _exitTimer = [NSTimer scheduledTimerWithTimeInterval:_exitDelay + target:self + selector:@selector(doDelayedExit) + userInfo:nil + repeats:NO]; } } -- (void)dissolveEffect:(BOOL)entering -{ - - [super orderFront:self]; -} - -- (void)slideVerticalEffect:(BOOL)entering +- (void)doDelayedExit { - [super orderFront:self]; + [self vanish:self]; + _exitTimer = nil; } -- (void)slideHorizontalEffect:(BOOL)entering +- (void)stopVanishTimer { - [super orderFront:self]; + if ( _exitTimer ) { + [_exitTimer invalidate]; + _exitTimer = nil; + } } - @end