From 4fe45fb3a18dd705bfeeab751323133481abf36e Mon Sep 17 00:00:00 2001 From: Akemi Date: Sat, 14 Jan 2017 15:41:23 +0100 Subject: 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. --- video/out/cocoa/window.m | 10 ++-------- 1 file 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; -- cgit v1.2.3