RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cocoa_common: make the fullscreen transition only when necessary 

This makes the cocoa backend follow more closely the new fullscreen semantics
added in c4b08a9a.
This commit is contained in:
Stefano Pigozzi 2013-07-20 12:08:14 +02:00
parent cd219e2c5d
commit 7088fe3fec
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
video/out/cocoa_common.m
View File

@ -621,23 +621,32 @@ int vo_cocoa_cgl_color_size(struct vo *vo)
}
}
- (BOOL)isInFullScreenMode
{
return (([self styleMask] & NSFullScreenWindowMask) ==
NSFullScreenWindowMask);
}
- (void)toggleMissionControlFullScreen:(BOOL)willBeFullscreen
{
struct vo_cocoa_state *s = self.videoOutput->cocoa;
if (willBeFullscreen) {
if (willBeFullscreen && ![self isInFullScreenMode]) {
[self setContentResizeIncrements:NSMakeSize(1, 1)];
} else {
[self setContentAspectRatio:s->current_video_size];
[self toggleFullScreen:nil];
}
if (!willBeFullscreen && [self isInFullScreenMode]) {
[self setContentAspectRatio:s->current_video_size];
[self toggleFullScreen:nil];
}
[self toggleFullScreen:nil];
}
- (void)toggleViewFullscreen:(BOOL)willBeFullscreen
{
struct vo_cocoa_state *s = self.videoOutput->cocoa;
if (willBeFullscreen) {
if (willBeFullscreen && ![s->view isInFullScreenMode]) {
NSApplicationPresentationOptions popts =
NSApplicationPresentationDefault;
@ -659,7 +668,9 @@ int vo_cocoa_cgl_color_size(struct vo *vo)
// sending the View fullscreen to another screen. Make it go away
// manually.
[s->window orderOut:self];
} else {
}
if (!willBeFullscreen && [s->view isInFullScreenMode]) {
[s->view exitFullScreenModeWithOptions:nil];
// Show the "windowed" window again.