summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2018-02-28 00:46:16 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-02-28 00:48:44 -0800
commitaa974b2aa7b99ec94f66272a7ddd4bfc62438a2f (patch)
treea9da60bd11289da1a198a7578446e8359f321111 /video
parent38d614d8d668f1255f092f825ac4223f774f5991 (diff)
downloadmpv-aa974b2aa7b99ec94f66272a7ddd4bfc62438a2f.tar.bz2
mpv-aa974b2aa7b99ec94f66272a7ddd4bfc62438a2f.tar.xz
cocoa-cb: make fullscreen resize animation duration configurable
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa-cb/window.swift13
1 files changed, 11 insertions, 2 deletions
diff --git a/video/out/cocoa-cb/window.swift b/video/out/cocoa-cb/window.swift
index f720205e5c..c2a6feea9d 100644
--- a/video/out/cocoa-cb/window.swift
+++ b/video/out/cocoa-cb/window.swift
@@ -252,7 +252,7 @@ class Window: NSWindow, NSWindowDelegate {
hideTitleBar()
NSAnimationContext.runAnimationGroup({ (context) -> Void in
- context.duration = duration - 0.05
+ context.duration = getFsAnimationDuration(duration - 0.05)
window.animator().setFrame(intermediateFrame, display: true)
}, completionHandler: { })
}
@@ -264,7 +264,7 @@ class Window: NSWindow, NSWindowDelegate {
setFrame(intermediateFrame, display: true)
NSAnimationContext.runAnimationGroup({ (context) -> Void in
- context.duration = duration - 0.05
+ context.duration = getFsAnimationDuration(duration - 0.05)
window.animator().setFrame(newFrame, display: true)
}, completionHandler: { })
}
@@ -328,6 +328,15 @@ class Window: NSWindow, NSWindowDelegate {
cocoaCB.layer.neededFlips += 1
}
+ func getFsAnimationDuration(_ def: Double) -> Double{
+ let duration = mpv.getStringProperty("macos-fs-animation-duration") ?? "default"
+ if duration == "default" {
+ return def
+ } else {
+ return Double(duration)!/1000
+ }
+ }
+
func setOnTop(_ state: Bool) {
if state {
let ontopLevel = mpv.getStringProperty("ontop-level") ?? "window"