summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorEvgeny Zinoviev <me@ch1p.io>2021-02-20 23:07:00 +0300
committerder richter <der.richter@gmx.de>2021-02-21 13:38:53 +0100
commitf913570aada74df0e56b3224bfe9f712c95789d1 (patch)
tree9b9fd9ffb597e9ab6fa104f6a044e7bf3e3ef3cf /video
parentc766e47b7095568509173e49fb049ff1b501b71d (diff)
downloadmpv-f913570aada74df0e56b3224bfe9f712c95789d1.tar.bz2
mpv-f913570aada74df0e56b3224bfe9f712c95789d1.tar.xz
mac: support --on-all-workspaces option
Diffstat (limited to 'video')
-rw-r--r--video/out/mac/common.swift5
-rw-r--r--video/out/mac/window.swift8
2 files changed, 13 insertions, 0 deletions
diff --git a/video/out/mac/common.swift b/video/out/mac/common.swift
index 6c3d0fcfb3..7ede81cbda 100644
--- a/video/out/mac/common.swift
+++ b/video/out/mac/common.swift
@@ -100,6 +100,7 @@ class Common: NSObject {
}
window.setOnTop(Bool(mpv.opts.ontop), Int(mpv.opts.ontop_level))
+ window.setOnAllWorkspaces(Bool(mpv.opts.all_workspaces))
window.keepAspect = Bool(mpv.opts.keepaspect_window)
window.title = title
window.border = Bool(mpv.opts.border)
@@ -547,6 +548,10 @@ class Common: NSObject {
DispatchQueue.main.async {
self.window?.setOnTop(Bool(mpv.opts.ontop), Int(mpv.opts.ontop_level))
}
+ case MPVHelper.getPointer(&mpv.optsPtr.pointee.all_workspaces):
+ DispatchQueue.main.async {
+ self.window?.setOnAllWorkspaces(Bool(mpv.opts.all_workspaces))
+ }
case MPVHelper.getPointer(&mpv.optsPtr.pointee.keepaspect_window):
DispatchQueue.main.async {
self.window?.keepAspect = Bool(mpv.opts.keepaspect_window)
diff --git a/video/out/mac/window.swift b/video/out/mac/window.swift
index a418f2ce75..8bff330866 100644
--- a/video/out/mac/window.swift
+++ b/video/out/mac/window.swift
@@ -278,6 +278,14 @@ class Window: NSWindow, NSWindowDelegate {
}
}
+ func setOnAllWorkspaces(_ state: Bool) {
+ if state {
+ collectionBehavior.insert(.canJoinAllSpaces)
+ } else {
+ collectionBehavior.remove(.canJoinAllSpaces)
+ }
+ }
+
func setMinimized(_ stateWanted: Bool) {
if isMiniaturized == stateWanted { return }