From da374c40de9ca166c04cccc0ce526407f5e58e8e Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 17 Aug 2012 13:48:37 +0200 Subject: cocoa_common: improve conditional dock hiding from 3259e4a7a Make the conditional hiding logic introduced in commit 3259e4a7a2a938 ("cocoa_common: make fullscreen menubar/dock hiding conditional") work when mplayer is started with the `fs` and `xineramascreen` options. --- libvo/cocoa_common.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libvo/cocoa_common.m') diff --git a/libvo/cocoa_common.m b/libvo/cocoa_common.m index 84db6995ed..d1e835105e 100644 --- a/libvo/cocoa_common.m +++ b/libvo/cocoa_common.m @@ -666,8 +666,9 @@ void create_menu() if (vo_fs) { [s->window makeKeyAndOrderFront:s->window]; [s->window setLevel:s->fullscreen_window_level]; - [NSApp setPresentationOptions:NSApplicationPresentationHideDock| - NSApplicationPresentationHideMenuBar]; + if (current_screen_has_dock_or_menubar()) + [NSApp setPresentationOptions:NSApplicationPresentationHideDock| + NSApplicationPresentationHideMenuBar]; } } -- cgit v1.2.3