Commit 9266718f authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: make sure that the non-native fullscreen mode is correctly left when a clip is over

parent 3d7351e6
...@@ -1219,6 +1219,9 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1219,6 +1219,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
[self makeFirstResponder: o_video_view]; [self makeFirstResponder: o_video_view];
else else
[self makeFirstResponder: nil]; [self makeFirstResponder: nil];
if (!b_videoPlayback && b_fullscreen && !b_nativeFullscreenMode)
[self leaveFullscreenAndFadeOut: YES];
} }
- (void)resizeWindow - (void)resizeWindow
...@@ -1547,7 +1550,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1547,7 +1550,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if (OSX_LEOPARD) if (OSX_LEOPARD)
SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar); SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
else else
[NSApp setPresentationOptions:(NSApplicationPresentationDefault)]; [NSApp setPresentationOptions: NSApplicationPresentationDefault];
/* Will release the lock */ /* Will release the lock */
[self hasEndedFullscreen]; [self hasEndedFullscreen];
......
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