6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-09-30 07:55:01 +00:00
Code Issues Projects Releases Wiki Activity

Simplify ViewFader and avoid second-guessing when to hard-set opacity.

Browse Source
This commit is contained in:
Thomas Harte 2021-07-14 20:50:41 -04:00
parent 4bc0b75c30
commit 33cc1154a2
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OSBindings/Mac/Clock Signal/Documents/MachineDocument.swift
View File

@ -746,7 +746,6 @@ class MachineDocument:
/// CoreAnimation.
private class ViewFader: NSObject, CAAnimationDelegate {
private var views: [NSView]
private var opacity: Float = 0.0
init(views: [NSView]) {
self.views = views
@ -755,12 +754,6 @@ class MachineDocument:
}
}
func animationDidStart(_ anim: CAAnimation) {
for view in views {
view.layer!.opacity = opacity
}
}
func animationDidStop(_ animation: CAAnimation, finished: Bool) {
if finished {
for view in views {
@ -770,22 +763,18 @@ class MachineDocument:
}
func animateIn() {
opacity = 1.0
for view in views {
view.layer?.removeAllAnimations()
view.isHidden = false
view.layer?.opacity = 1.0
}
}
func animateOut(delay : TimeInterval) {
// Do nothing if already animating out.
// Do nothing if already animating out or invisible.
if views[0].isHidden || views[0].layer?.animation(forKey: "opacity") != nil {
return
}
opacity = 0.0
for view in views {
let fadeAnimation = CABasicAnimation(keyPath: "opacity")
fadeAnimation.beginTime = CACurrentMediaTime() + delay
@ -794,6 +783,9 @@ class MachineDocument:
fadeAnimation.duration = 0.2
fadeAnimation.delegate = self
fadeAnimation.fillMode = .forwards
fadeAnimation.isRemovedOnCompletion = false
view.layer?.removeAllAnimations()
view.layer!.add(fadeAnimation, forKey: "opacity")
}