[vlc-commits] macosx: block macosx-background when lion fullscreen is enabled

David Fuhrmann git at videolan.org
Mon Jul 23 14:18:03 CEST 2012


vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Jul 23 13:56:19 2012 +0200| [1f9b2e8891494859ab821af1d686ab03ec9124cb] | committer: David Fuhrmann

macosx: block macosx-background when lion fullscreen is enabled

close #5174

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1f9b2e8891494859ab821af1d686ab03ec9124cb
---

 modules/gui/macosx/MainWindow.m |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 5c85b55..223882b 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1751,7 +1751,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (id)setupVideoView
 {
-    if( config_GetInt( VLCIntf, "macosx-background" ) )
+    // TODO: make lion fullscreen compatible with macosx-background and !embedded-video
+    if( config_GetInt( VLCIntf, "macosx-background" ) && !b_nativeFullscreenMode )
     {
         msg_Dbg( VLCIntf, "Creating background window" );
         NSScreen *screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)config_GetInt( VLCIntf, "macosx-vdev" )];



More information about the vlc-commits mailing list