summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2012-08-17 13:48:37 +0200
committerwm4 <wm4@nowhere>2012-08-28 23:21:07 +0200
commitda374c40de9ca166c04cccc0ce526407f5e58e8e (patch)
tree06db44181eadd296a637db1c8c3efebbad7952e9
parent3972642cb8ee4629be0d64fee06f67bf7e95c98d (diff)
downloadmpv-da374c40de9ca166c04cccc0ce526407f5e58e8e.tar.bz2
mpv-da374c40de9ca166c04cccc0ce526407f5e58e8e.tar.xz
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.
-rw-r--r--libvo/cocoa_common.m5
1 files changed, 3 insertions, 2 deletions
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];
}
}