maddiefuzz/SoyuzCapsule
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Refactor code, ensure websocket connection (and @ObservableObject updates) occur on main thread

Browse Source
This commit is contained in:
Madeline
2023-03-20 20:31:18 -04:00
parent ba42ff1207
commit 0a8670ed71
3 changed files with 72 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Soyuz/SoyuzApp.swift
View File

@@ -13,7 +13,7 @@ struct SoyuzApp: App {
@State var currentIcon = "move.3d"
@ObservedObject var printerManager = PrinterRequestManager()
@ObservedObject static var printerManager = PrinterRequestManager()
var body: some Scene {
// WindowGroup(id: "floating-stats") {
@@ -22,13 +22,13 @@ struct SoyuzApp: App {
// }
WindowGroup("Configuration", id: "soyuz_cfg", content: {
PrinterConfigView(printerManager: printerManager)
PrinterConfigView(printerManager: SoyuzApp.printerManager)
//.frame(minWidth: 300, maxWidth: 600, minHeight: 60, maxHeight: 100)
})
.windowResizability(.contentSize)
MenuBarExtra("Soyuz", systemImage: currentIcon) {
SoyuzMenuBarExtraView(printerManager: printerManager, currentMenuBarIcon: $currentIcon)
SoyuzMenuBarExtraView(printerManager: SoyuzApp.printerManager, currentMenuBarIcon: $currentIcon)
.padding([.top, .leading, .trailing], 8)
.padding([.bottom], 6)
}