summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2019-12-15 20:13:28 +0100
committerder richter <der.richter@gmx.de>2020-01-09 20:41:44 +0100
commit28609cc4980d7a3949d2cf964048cb20f3ab8d85 (patch)
tree4542bf6a2d08a3949543292b7390036d05a80e59
parentea9f9af76ccd4be67bbafabb955d1b0ae0eeafdc (diff)
downloadmpv-28609cc4980d7a3949d2cf964048cb20f3ab8d85.tar.bz2
mpv-28609cc4980d7a3949d2cf964048cb20f3ab8d85.tar.xz
cocoa-cb: don't active window when minimized or hidden on file change
Fixes #7195
-rw-r--r--video/out/cocoa_cb_common.swift7
1 files changed, 6 insertions, 1 deletions
diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift
index 9ba4ffd920..4be17c061c 100644
--- a/video/out/cocoa_cb_common.swift
+++ b/video/out/cocoa_cb_common.swift
@@ -81,6 +81,7 @@ class CocoaCB: NSObject {
func uninit() {
window?.orderOut(nil)
+ window?.close()
mpv = nil
}
@@ -129,6 +130,7 @@ class CocoaCB: NSObject {
titleBar = TitleBar(frame: wr, window: window, cocoaCB: self)
window.isRestorable = false
+ window.isReleasedWhenClosed = false
window.makeMain()
window.makeKeyAndOrderFront(nil)
NSApp.activate(ignoringOtherApps: true)
@@ -153,7 +155,10 @@ class CocoaCB: NSObject {
}
let wr = getWindowGeometry(forScreen: targetScreen, videoOut: vo)
- if !(window?.isVisible ?? false) {
+ if !(window?.isVisible ?? false) &&
+ !(window?.isMiniaturized ?? false) &&
+ !NSApp.isHidden
+ {
window?.makeKeyAndOrderFront(nil)
}
layer?.atomicDrawingStart()