diff options
author | Akemi <der.richter@gmx.de> | 2019-01-19 11:43:31 +0100 |
---|---|---|
committer | sfan5 <sfan5@live.de> | 2019-01-23 09:32:02 +0100 |
commit | a4298b1a6984319f0d4fe6cc4ab21164d8ae423c (patch) | |
tree | 8eb3c9d95ea7c1f170e6d973e93f09360fa36538 /video/out/cocoa-cb | |
parent | 94d35627f55c7ee7601c476b4b79e1f3c2eca83b (diff) | |
download | mpv-a4298b1a6984319f0d4fe6cc4ab21164d8ae423c.tar.bz2 mpv-a4298b1a6984319f0d4fe6cc4ab21164d8ae423c.tar.xz |
cocoa-cb: fix side by side Split View again
some safety mechanism for the async fs animation aren't needed anymore,
due to possible improved logic and slightly different behaviour on new
macOS versions. that safety fallback prevented the Split View because
it always returned a rectangle of the whole screen, instead of just
part/half of it.
Fixes #6443
Diffstat (limited to 'video/out/cocoa-cb')
-rw-r--r-- | video/out/cocoa-cb/window.swift | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/cocoa-cb/window.swift b/video/out/cocoa-cb/window.swift index d11706f38b..ad93a9cebd 100644 --- a/video/out/cocoa-cb/window.swift +++ b/video/out/cocoa-cb/window.swift @@ -300,6 +300,7 @@ class Window: NSWindow, NSWindowDelegate { let intermediateFrame = aspectFit(rect: newFrame, in: screen!.frame) cocoaCB.view.layerContentsPlacement = .scaleProportionallyToFill hideTitleBar() + styleMask.remove(.fullScreen) setFrame(intermediateFrame, display: true) NSAnimationContext.runAnimationGroup({ (context) -> Void in @@ -435,9 +436,7 @@ class Window: NSWindow, NSWindowDelegate { } override func setFrame(_ frameRect: NSRect, display flag: Bool) { - let newFrame = !isAnimating && isInFullscreen ? targetScreen!.frame : - frameRect - super.setFrame(newFrame, display: flag) + super.setFrame(frameRect, display: flag) if keepAspect { contentAspectRatio = unfsContentFrame!.size |