[vlc-commits] macosx: make sure that the fullscreen controller is always available when playing a video in lion 's fullscreen mode

[Felix Paul Kühne]

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jan 21 20:50:52 2012 -0800| [3eaee8b856043a5901c114f95f45d25b47bec0f9] | committer: Jean-Baptiste Kempf

macosx: make sure that the fullscreen controller is always available when playing a video in lion's fullscreen mode
(cherry picked from commit a91121012e8cc73be977bf53f7003c0310768cc3)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=3eaee8b856043a5901c114f95f45d25b47bec0f9
---

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

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index f56fe2e..80cc50b 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1770,6 +1770,7 @@ 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];
 
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index a53d400..a793bf5 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1359,8 +1359,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
                 [o_mainwindow performSelectorOnMainThread:@selector(enterFullscreen) withObject:nil waitUntilDone:NO];
                 vlc_object_release( p_input );
             }
-        } 
-        else 
+        }
+        else
         {
             // leaving fullscreen is always allowed
             [o_mainwindow performSelectorOnMainThread:@selector(leaveFullscreen) withObject:nil waitUntilDone:NO];