Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 36 additions & 25 deletions app/Sources/BarViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,44 @@ final class BarViewModel: StateChangeHandler, @unchecked Sendable {
private var fullscreenDisplays: Set<UInt32> = []

func onStateChange(event: StateChangeEvent) throws {
DispatchQueue.main.async { [self] in
switch event {
case let .nodeAdded(display, node):
nodes[display, default: []].append(node)
scheduleRefresh(display)

case let .nodeRemoved(display, _):
let updated = getNodesForDisplay(display: display)
nodes[display] = updated
scheduleRefresh(display)

case let .nodeUpdated(display, node):
if let idx = nodes[display]?.firstIndex(where: { $0.name == node.name }) {
nodes[display]?[idx] = node
}
scheduleRefresh(display)

case let .nodeMoved(oldDisplay, newDisplay, node):
nodes[oldDisplay]?.removeAll { $0.name == node.name }
scheduleRefresh(oldDisplay)
nodes[newDisplay, default: []].append(node)
scheduleRefresh(newDisplay)
if Thread.isMainThread {
MainActor.assumeIsolated {
handleEvent(event)
}
} else {
DispatchQueue.main.async { [self] in
handleEvent(event)
}
}
}

case let .fullRefresh(display, newNodes):
nodes[display] = newNodes
scheduleRefresh(display)
@MainActor
private func handleEvent(_ event: StateChangeEvent) {
switch event {
case let .nodeAdded(display, node):
nodes[display, default: []].append(node)
scheduleRefresh(display)

case let .nodeRemoved(display, _):
let updated = getNodesForDisplay(display: display)
nodes[display] = updated
scheduleRefresh(display)

case let .nodeUpdated(display, node):
if let idx = nodes[display]?.firstIndex(where: { $0.name == node.name }) {
nodes[display]?[idx] = node
}
scheduleRefresh(display)

case let .nodeMoved(oldDisplay, newDisplay, node):
nodes[oldDisplay]?.removeAll { $0.name == node.name }
scheduleRefresh(oldDisplay)
nodes[newDisplay, default: []].append(node)
scheduleRefresh(newDisplay)

case let .fullRefresh(display, newNodes):
nodes[display] = newNodes
scheduleRefresh(display)
}
}

Expand Down