diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
| commit | 199aabddcc0105b504cc8e0cb240bc3c89288c1a (patch) | |
| tree | fa7eb297a8e11b5e0d9339196f23918d6a4d0b85 /video/out/cocoa-cb/window.swift | |
| parent | 7c565547b80fdc2a1bfdf31f9725129bcb16aa9d (diff) | |
| parent | 1d0349d3b5d9a263251fcb3b0d7e135d4731bfd0 (diff) | |
| download | mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.bz2 mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.xz | |
Merge branch 'master' into pr6360
Manual changes done:
* Merged the interface-changes under the already master'd changes.
* Moved the hwdec-related option changes to video/decode/vd_lavc.c.
Diffstat (limited to 'video/out/cocoa-cb/window.swift')
| -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 |