summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-06-11 21:20:46 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-06-11 21:20:46 +0200
commit4ffaf4868e1f86b0a9ac5761fa38b6c7caa1eafa (patch)
tree0155fd4785b9c401b1051f7bd9226373659c28e4 /video
parentd2d9ba326ae722f0e8ba9d63ee94da2460503b57 (diff)
downloadmpv-4ffaf4868e1f86b0a9ac5761fa38b6c7caa1eafa.tar.bz2
mpv-4ffaf4868e1f86b0a9ac5761fa38b6c7caa1eafa.tar.xz
cocoa_common: fix ontop switching when fullscreen
`enterFullScreenMode:withOptions:` creates another window so set the level on both the windowed window and current window. Also remove NSFullScreenModeWindowLevel as it seems to be superfluous.
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa_common.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 58cc1dacf8..57d453018c 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -266,7 +266,8 @@ static void vo_set_level(struct vo *vo, int ontop)
s->window_level = NSNormalWindowLevel;
}
- [s->window setLevel:s->window_level];
+ [[s->view window] setLevel:s->window_level];
+ [s->window setLevel:s->window_level];
}
void vo_cocoa_ontop(struct vo *vo)
@@ -635,7 +636,6 @@ int vo_cocoa_cgl_color_size(struct vo *vo)
popts |= NSApplicationPresentationAutoHideDock;
NSDictionary *fsopts = @{
- NSFullScreenModeWindowLevel : @(s->window_level),
NSFullScreenModeAllScreens : @NO,
NSFullScreenModeApplicationPresentationOptions : @(popts)
};