summaryrefslogtreecommitdiffstats
path: root/video/out/cocoa_common.m
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-05 18:07:27 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-05 18:07:27 +0200
commitc6b68c28f438f6f0f4e6b92782991211d868b858 (patch)
tree7bb9b47a493df9a2ad7a18ca30b8bf0d4e6c7d38 /video/out/cocoa_common.m
parent79688144704dd93169d86cc5a75385604e88c72c (diff)
downloadmpv-c6b68c28f438f6f0f4e6b92782991211d868b858.tar.bz2
mpv-c6b68c28f438f6f0f4e6b92782991211d868b858.tar.xz
cocoa: remove --fs-missioncontrol
This is the first of a series of commits that will change the Cocoa way in a way that is easily embeddable inside parent views. To reach that point common code must avoid referencing the parent NSWindow since that could be the host application's window.
Diffstat (limited to 'video/out/cocoa_common.m')
-rw-r--r--video/out/cocoa_common.m17
1 files changed, 2 insertions, 15 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 7bf78a8ce5..bd2fdd3ff7 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -331,11 +331,6 @@ static void create_ui(struct vo *vo, struct mp_rect *win, int geo_flags)
}
vo_set_level(vo, opts->ontop);
-
- if (opts->fs_missioncontrol) {
- [s->window setCollectionBehavior:
- NSWindowCollectionBehaviorFullScreenPrimary];
- }
}
static void cocoa_set_window_title(struct vo *vo, const char *title)
@@ -498,20 +493,12 @@ static void vo_cocoa_fullscreen(struct vo *vo)
vo_cocoa_update_screen_info(vo, NULL);
- if (opts->fs_missioncontrol) {
- if ([s->window conformsToProtocol:@protocol(MpvFullscreen)]) {
- id<MpvFullscreen> win = (id<MpvFullscreen>) s->window;
- [win setFullScreen:opts->fullscreen];
- }
- } else {
- draw_changes_after_next_frame(vo);
- [s->view setFullScreen:opts->fullscreen];
- }
+ draw_changes_after_next_frame(vo);
+ [s->view setFullScreen:opts->fullscreen];
if (s->icc_fs_profile_path != s->icc_wnd_profile_path)
s->icc_profile_path_changed = true;
- // Make the core aware of the view size change.
resize_window(vo);
}