[vlc-commits] macosx: lion fullscreen: show fs controller not before animation is finished

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Fri Apr 20 22:53:13 2012 +0200| [5fcefdc6de664858778f68d92aa279091a35a90c] | committer: David Fuhrmann

macosx: lion fullscreen: show fs controller not before animation is finished
(cherry picked from commit 69d5d9aeaac87a57b67d18a98736066d77d06524)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5fcefdc6de664858778f68d92aa279091a35a90c
---

 modules/gui/macosx/CompatibilityFixes.h |    1 +
 modules/gui/macosx/MainWindow.h         |    1 +
 modules/gui/macosx/MainWindow.m         |    8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/CompatibilityFixes.h b/modules/gui/macosx/CompatibilityFixes.h
index 8901259..cc0d504 100644
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -95,6 +95,7 @@ enum {
 - (void)setRestorable:(BOOL)b_value;
 - (void)toggleFullScreen:(id)id_value;
 - (void)windowWillEnterFullScreen:(NSNotification *)notification;
+- (void)windowDidEnterFullScreen:(NSNotification *)notification;
 - (void)windowWillExitFullScreen:(NSNotification *)notification;
 @end
 
diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index e47efcb..02e5457 100644
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -196,6 +196,7 @@
 
 /* lion's native fullscreen handling */
 - (void)windowWillEnterFullScreen:(NSNotification *)notification;
+- (void)windowDidEnterFullScreen:(NSNotification *)notification;
 - (void)windowWillExitFullScreen:(NSNotification *)notification;
 
 @end
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index abbafd5..39dffa2 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -2095,8 +2095,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
     
     [o_video_view setFrame: [[self contentView] frame]];
     b_fullscreen = YES;
-    [o_fspanel setVoutWasUpdated: (int)[[self screen] displayID]];
-    [o_fspanel setActive: nil];
 
     [self recreateHideMouseTimer];
     i_originalLevel = [self level];
@@ -2123,6 +2121,12 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [self setMovableByWindowBackground: NO];
 }
 
+- (void)windowDidEnterFullScreen:(NSNotification *)notification
+{
+    [o_fspanel setVoutWasUpdated: (int)[[self screen] displayID]];
+    [o_fspanel setActive: nil];
+}
+
 - (void)windowWillExitFullScreen:(NSNotification *)notification
 {