From 496b1f5fc878edde8e21bb749c76495ca5cfa4ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 26 Nov 2006 19:48:39 +0000 Subject: [PATCH] * missing file in previous commit --- modules/gui/macosx/fspanel.m | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m index 584325e052..607b3649f9 100644 --- a/modules/gui/macosx/fspanel.m +++ b/modules/gui/macosx/fspanel.m @@ -115,10 +115,18 @@ /* This routine is called repeatedly to fade in the window */ - (void)focus:(NSTimer *)timer { + /* we need to push ourselves to front if the vout window was closed since our last display */ + if( b_voutWasUpdated ) + { + [self orderFront: self]; + b_voutWasUpdated = NO; + } + if( [self alphaValue] < 1.0 ) [self setAlphaValue:[self alphaValue]+0.1]; if( [self alphaValue] >= 1.0 ) { + b_displayed = YES; [self setAlphaValue: 1.0]; [self setFadeTimer:nil]; if( b_fadeQueued ) @@ -145,6 +153,7 @@ [self setAlphaValue:[self alphaValue]-0.1]; if( [self alphaValue] <= 0.1 ) { + b_displayed = NO; [self setAlphaValue:0.0]; [self setFadeTimer:nil]; if( b_fadeQueued ) @@ -257,6 +266,16 @@ point.y -= mouseClic.y; [self setFrameOrigin:point]; } + +- (BOOL)isDisplayed +{ + return b_displayed; +} + +- (void)setVoutWasUpdated +{ + b_voutWasUpdated = YES; +} @end /***************************************************************************** -- 2.20.1