From 37f24581df46af51482f3acf7df120522eec4d77 Mon Sep 17 00:00:00 2001 From: David Fuhrmann Date: Mon, 30 Apr 2012 09:01:42 +0200 Subject: [PATCH] macosx: small clarification regarding fullscreen controller --- modules/gui/macosx/MainWindow.m | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 9168c8f5fa..dea33d6c72 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -1541,9 +1541,9 @@ static VLCMainWindow *_o_sharedInstance = nil; [o_bottombar_view setHidden: b_videoPlayback]; else [o_bottombar_view setHidden: NO]; - if( b_videoPlayback ) + if( b_videoPlayback && b_fullscreen ) [o_fspanel setActive: nil]; - else + if( !b_videoPlayback ) [o_fspanel setNonActive: nil]; } @@ -1848,8 +1848,6 @@ static VLCMainWindow *_o_sharedInstance = nil; if( [o_videoWindow isVisible] ) [o_videoWindow orderOut: self]; - [o_fspanel setActive: nil]; - b_fullscreen = YES; [self unlockFullscreenAnimation]; } -- 2.39.2