macosx: fix float-on-top behaviour with fullscreen

The issues were mostly noticable if you select both float-on-top
and fullscreen in video prefs.

diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 67daa6a46e834636da26397bec331037e5bcc770..fb934b80f74e761b8e88146644f2f946615168a2 100644 (file)
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -286,7 +286,7 @@
     if(i_level == NSStatusWindowLevel) {
         i_statusLevelWindowCounter++;
         // window level need to stay on normal in fullscreen mode
-        if (![o_window fullscreen])
+        if (![o_window fullscreen] && ![o_window enteringFullscreenTransition])
             [self updateWindowLevelForHelperWindows:i_level];
     } else {
         if (i_statusLevelWindowCounter > 0)

diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index f71799e7578b879a97615cf92d09239ea1ecd545..032ac24ae73c383c4ed3b45df92f5446299d38e0 100644 (file)
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -465,12 +465,10 @@
     if (var_InheritBool(VLCIntf, "video-wallpaper") || [self level] < NSNormalWindowLevel)
         return;
 
-    if (!b_fullscreen)
+    if (!b_fullscreen && !b_entering_fullscreen_transition)
         [self setLevel: i_state];
     else {
         // only save it for restore
-        // TODO this does not handle the case when level is
-        // changed in the middle of a fullscreen animation
         i_originalLevel = i_state;
     }
 }
@@ -618,6 +616,11 @@
     // workaround, see #6668
     [NSApp setPresentationOptions:(NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
 
+    i_originalLevel = [self level];
+    // b_fullscreen and b_entering_fullscreen_transition must not be true yet
+    [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
+    [self setLevel:NSNormalWindowLevel];
+
     b_entering_fullscreen_transition = YES;
 
     var_SetBool(pl_Get(VLCIntf), "fullscreen", true);
@@ -633,11 +636,6 @@
     if ([self hasActiveVideo])
         [[VLCMainWindow sharedInstance] recreateHideMouseTimer];
 
-    i_originalLevel = [self level];
-    // b_fullscreen must not be true yet
-    [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
-    [self setLevel:NSNormalWindowLevel];
-
     if (b_dark_interface) {
         [o_titlebar_view removeFromSuperviewWithoutNeedingDisplay];
 
@@ -890,6 +888,8 @@
 
     [o_fullscreen_anim1 startAnimation];
     /* fullscreenAnimation will be unlocked when animation ends */
+
+    b_entering_fullscreen_transition = YES;
 }
 
 - (void)hasBecomeFullscreen
@@ -907,6 +907,7 @@
     if ([self isVisible])
         [self orderOut: self];
 
+    b_entering_fullscreen_transition = NO;
     [self setFullscreen:YES];
 }