Commit c63f722d authored by David Fuhrmann's avatar David Fuhrmann

macosx: fix float-on-top in combination with fullscreen

parent c90f1aa6
......@@ -720,12 +720,13 @@
- (void)windowWillEnterFullScreen:(NSNotification *)notification
{
i_originalLevel = [self level];
b_windowShouldExitFullscreenWhenFinished = [[VLCMain sharedInstance] activeVideoPlayback];
NSInteger i_currLevel = [self level];
// b_fullscreen and b_in_fullscreen_transition must not be true yet
[[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
[self setLevel:NSNormalWindowLevel];
i_originalLevel = i_currLevel;
b_in_fullscreen_transition = YES;
......@@ -877,10 +878,11 @@
[screen blackoutOtherScreens];
/* Make sure we don't see the window flashes in float-on-top mode */
i_originalLevel = [self level];
NSInteger i_currLevel = [self level];
// b_fullscreen must not be true yet
[[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
[self setLevel:NSNormalWindowLevel];
i_originalLevel = i_currLevel; // would be overwritten by previous call
/* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
if (!o_fullscreen_window) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment