From 586c9e71554914daf7f60c4610c4ef4e85c274eb Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 1 Dec 2014 18:05:30 +0100 Subject: cocoa: allow to black out other display when going fs fixes #1302 --- video/out/cocoa/events_view.m | 2 +- video/out/cocoa/mpvadapter.h | 1 + video/out/cocoa_common.m | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'video') diff --git a/video/out/cocoa/events_view.m b/video/out/cocoa/events_view.m index c3e626b0fe..8e96ac1244 100644 --- a/video/out/cocoa/events_view.m +++ b/video/out/cocoa/events_view.m @@ -67,7 +67,7 @@ popts |= NSApplicationPresentationAutoHideDock; NSDictionary *fsopts = @{ - NSFullScreenModeAllScreens : @NO, + NSFullScreenModeAllScreens : @([self.adapter fsModeAllScreens]), NSFullScreenModeApplicationPresentationOptions : @(popts) }; diff --git a/video/out/cocoa/mpvadapter.h b/video/out/cocoa/mpvadapter.h index 8829abd096..f54c26593f 100644 --- a/video/out/cocoa/mpvadapter.h +++ b/video/out/cocoa/mpvadapter.h @@ -33,5 +33,6 @@ - (BOOL)keyboardEnabled; - (BOOL)mouseEnabled; - (NSScreen *)fsScreen; +- (BOOL)fsModeAllScreens; @property(nonatomic, assign) struct vo *vout; @end diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index 4ac6433f84..83c006d86f 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -795,6 +795,11 @@ void *vo_cocoa_cgl_pixel_format(struct vo *vo) return s->fs_screen; } +- (BOOL)fsModeAllScreens +{ + return self.vout->opts->fs_black_out_screens; +} + - (void)handleFilesArray:(NSArray *)files { [[EventsResponder sharedInstance] handleFilesArray:files]; -- cgit v1.2.3