[vlc-commits] macosx: do not explicitely set presentation options for native fullscreen mode

David Fuhrmann git at videolan.org
Mon Mar 31 20:29:41 CEST 2014


vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Mar 31 20:20:46 2014 +0200| [67004e36c5b3d9aaef68b2febcbe1df531829fe9] | committer: David Fuhrmann

macosx: do not explicitely set presentation options for native fullscreen mode

These flags will be set internally to the correct values. Mavericks even
warns in the log that these calls are ignored. Additionally, the os itself
knows best if the dock needs to be hidden - this is not always the case due
to the new multi-monitor fullscreen in Mavericks.

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

 modules/gui/macosx/VLCVoutWindowController.m |    5 -----
 modules/gui/macosx/Windows.m                 |    4 ----
 2 files changed, 9 deletions(-)

diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 584d3c2..9d1e712 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -348,11 +348,6 @@
 
             [o_current_window toggleFullScreen:self];
         }
-
-        if (b_fullscreen)
-            [NSApp setPresentationOptions:(NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
-        else
-            [NSApp setPresentationOptions:(NSApplicationPresentationDefault)];
     } else {
         assert(o_current_window);
 
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index 9ef3810..4f6bfc6 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -710,9 +710,6 @@
 
 - (void)windowWillEnterFullScreen:(NSNotification *)notification
 {
-    // workaround, see #6668
-    [NSApp setPresentationOptions:(NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
-
     i_originalLevel = [self level];
     b_windowShouldExitFullscreenWhenFinished = [[VLCMain sharedInstance] activeVideoPlayback];
 
@@ -778,7 +775,6 @@
         if ([[subviews objectAtIndex:x] respondsToSelector:@selector(reshape)])
             [[subviews objectAtIndex:x] reshape];
     }
-
 }
 
 - (void)windowWillExitFullScreen:(NSNotification *)notification



More information about the vlc-commits mailing list