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

Fixes LED ordering.

Browse Source 
Still work to do on capturing the proper window title.
This commit is contained in:
Thomas Harte 2021-07-14 22:01:42 -04:00
parent 58451d7c0c
commit 47a530fd5c
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,9 +153,10 @@ class MachineDocument:
func windowDidUpdate(_ notification: Notification) {
if self.windowControllers.count > 0, let window = self.windowControllers[0].window, window.isVisible {
// Grab the regular window title, if it's not already stored.
if self.unadornedWindowTitle.count == 0 {
if self.unadornedWindowTitle == "" {
self.unadornedWindowTitle = window.title
}
updateWindowTitle()
// If an interaction mode is not yet in effect, pick the proper one and display the relevant thing.
if self.interactionMode == .notStarted {
@ -743,20 +744,21 @@ class MachineDocument:
private func updateActivityViewVisibility() {
// If any LEDs are now visible, make sure the activity view is showing.
// Otherwise, hide it.
let litLEDs = self.leds.filter { $0.value.isLit }
let window = self.windowControllers.first!.window!
if litLEDs.isEmpty || !window.styleMask.contains(.fullScreen) {
activityFader.animateOut(delay: window.styleMask.contains(.fullScreen) ? 0.2 : 0.0)
} else {
activityFader.animateIn()
}
if let window = self.windowControllers.first?.window {
let litLEDs = self.leds.filter { $0.value.isLit }
if litLEDs.isEmpty || !window.styleMask.contains(.fullScreen) {
activityFader.animateOut(delay: window.styleMask.contains(.fullScreen) ? 0.2 : 0.0)
} else {
activityFader.animateIn()
}
// Manipulate the window title.
windowLEDSuffix = ""
for led in self.leds {
windowLEDSuffix += " " + (led.value.isLit ? "■" : "□")
// Manipulate the window title.
windowLEDSuffix = ""
for ledName in machine.leds {
windowLEDSuffix += " " + (leds[ledName]!.isLit ? "■" : "□")
}
updateWindowTitle()
}
updateWindowTitle()
}
// MARK: - In-window panels (i.e. options, volume).