macosx: only revert presentation options on fullscreen leave which are touched...

macosx: only revert presentation options on fullscreen leave which are touched when entering fs for this particular window

This fixes menu / dock hide behaviour when handling around with multiple
vout windows which are set to fullscreen on multiple monitors, especially when
leaving fullscreen for one window with other windows still in fullscreen state.

modules/gui/macosx/Windows.m

@@ -930,7 +930,7 @@
         }
 
         [[[VLCMainWindow sharedInstance] fsPanel] setNonActive: nil];
-        [NSApp setPresentationOptions: NSApplicationPresentationDefault];
+        [[o_fullscreen_window screen] setNonFullscreenPresentationOptions];
 
         /* Will release the lock */
         [self hasEndedFullscreen];
@@ -952,7 +952,7 @@
     [[o_video_view window] orderFront: self];
 
     [[[VLCMainWindow sharedInstance] fsPanel] setNonActive: nil];
-    [NSApp setPresentationOptions:(NSApplicationPresentationDefault)];
+    [[o_fullscreen_window screen] setNonFullscreenPresentationOptions];
 
     if (o_fullscreen_anim1) {
         [o_fullscreen_anim1 stopAnimation];

modules/gui/macosx/misc.h

@@ -65,6 +65,9 @@
 - (CGDirectDisplayID)displayID;
 - (void)blackoutOtherScreens;
 + (void)unblackoutScreens;
+
+- (void)setFullscreenPresentationOptions;
+- (void)setNonFullscreenPresentationOptions;
 @end
 
 

modules/gui/macosx/misc.m

@@ -256,10 +256,9 @@ static NSMutableArray *blackoutWindows = NULL;
 
     for (NSUInteger i = 0; i < blackoutWindowCount; i++) {
         VLCWindow *blackoutWindow = [blackoutWindows objectAtIndex: i];
+        [[blackoutWindow screen] setNonFullscreenPresentationOptions];
         [blackoutWindow closeAndAnimate: YES];
     }
-
-    [NSApp setPresentationOptions:(NSApplicationPresentationDefault)];
 }
 
 - (void)setFullscreenPresentationOptions
@@ -272,6 +271,16 @@ static NSMutableArray *blackoutWindows = NULL;
     [NSApp setPresentationOptions:presentationOpts];
 }
 
+- (void)setNonFullscreenPresentationOptions
+{
+    NSApplicationPresentationOptions presentationOpts = [NSApp presentationOptions];
+    if ([self hasMenuBar])
+        presentationOpts &= (~NSApplicationPresentationAutoHideMenuBar);
+    if ([self hasMenuBar] || [self hasDock])
+        presentationOpts &= (~NSApplicationPresentationAutoHideDock);
+    [NSApp setPresentationOptions:presentationOpts];
+}
+
 @end
 
 /*****************************************************************************