diff options
| author | Akemi <der.richter@gmx.de> | 2017-01-14 15:41:23 +0100 |
|---|---|---|
| committer | Akemi <der.richter@gmx.de> | 2017-01-19 14:51:11 +0100 |
| commit | 4fe45fb3a18dd705bfeeab751323133481abf36e (patch) | |
| tree | d148f832b3624549c4146c1f72a331e1b77409b5 /video/out/cocoa/window.m | |
| parent | 8cbb2b5e9a652457ca3aa35c55091983f6bcbb35 (diff) | |
| download | mpv-4fe45fb3a18dd705bfeeab751323133481abf36e.tar.bz2 mpv-4fe45fb3a18dd705bfeeab751323133481abf36e.tar.xz | |
cocoa: fix window size in certain circumstances
a combination of starting from bundle and fullscreen used the standard
window size (960x480) from the pseudo GUI instead of the wanted video
size.
Diffstat (limited to 'video/out/cocoa/window.m')
| -rw-r--r-- | video/out/cocoa/window.m | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/video/out/cocoa/window.m b/video/out/cocoa/window.m index 2bc7a5865a..a661565c1d 100644 --- a/video/out/cocoa/window.m +++ b/video/out/cocoa/window.m @@ -332,11 +332,6 @@ display:NO]; } -- (void)updateWindowFrame:(NSSize)newSize -{ - _unfs_content_frame = [self frameRect:_unfs_content_frame forCenteredContentSize:newSize]; -} - - (void)tryDequeueSize { if (_queued_video_size.width <= 0.0 || _queued_video_size.height <= 0.0) @@ -349,9 +344,8 @@ - (void)queueNewVideoSize:(NSSize)newSize { - if ([self.adapter isInFullScreenMode]) { - [self updateWindowFrame:newSize]; - } else { + _unfs_content_frame = [self frameRect:_unfs_content_frame forCenteredContentSize:newSize]; + if (![self.adapter isInFullScreenMode]) { if (NSEqualSizes(_queued_video_size, newSize)) return; _queued_video_size = newSize; |