Fix for appearance overlay appearing on wrong screen when the correct screen has a fullscreen space

We're already checking for this, but an old timer that isn't really needed anymore was bypassing this and showing the panel.

For good measure, we add an extra check as well

Author: jordanbaird

Diff for: Ice/MenuBarAppearance/MenuBarAppearanceManager.swift

@@ -12,7 +12,7 @@ import OSLog
 final class MenuBarAppearanceManager: ObservableObject {
     @Published var configuration: MenuBarAppearanceConfiguration = .defaultConfiguration
 
-    @Published private(set) var canEditAppearance = true
+    @Published private(set) var canChangeAppearance = true
 
     private var cancellables = Set<AnyCancellable>()
 
@@ -77,7 +77,7 @@ final class MenuBarAppearanceManager: ObservableObject {
                 else {
                     return
                 }
-                canEditAppearance = !isMenuBarHidden
+                canChangeAppearance = !isMenuBarHidden
             }
             .store(in: &c)
 

Diff for: Ice/MenuBarAppearance/MenuBarOverlayPanel.swift

@@ -169,17 +169,6 @@ class MenuBarOverlayPanel: NSPanel {
         }
         .store(in: &c)
 
-        // make sure the panel switches to the active space
-        Timer.publish(every: 2.5, on: .main, in: .default)
-            .autoconnect()
-            .sink { [weak self] _ in
-                guard let self, !isOnActiveSpace else {
-                    return
-                }
-                needsShow = true
-            }
-            .store(in: &c)
-
         // continually update the desktop wallpaper; ideally, we would set up
         // an observer for a wallpaper change notification, but macOS doesn't
         // post one anymore; updating every 5 seconds at least keeps the CPU
@@ -234,8 +223,8 @@ class MenuBarOverlayPanel: NSPanel {
 
         if let appState {
             appState.menuBarManager.$isMenuBarHiddenBySystem
-                .sink { [weak self] isHandled in
-                    self?.alphaValue = isHandled ? 0 : 1
+                .sink { [weak self] isHidden in
+                    self?.alphaValue = isHidden ? 0 : 1
                 }
                 .store(in: &c)
         }
@@ -255,15 +244,19 @@ class MenuBarOverlayPanel: NSPanel {
         case .showing: "Preventing overlay panel from showing."
         case .updates: "Preventing overlay panel from updating."
         }
-        let owningDisplay = owningScreen.displayID
         guard let appState else {
             Logger.overlayPanel.notice("No app state. \(actionMessage)")
             return nil
         }
+        guard appState.menuBarManager.appearanceManager.canChangeAppearance else {
+            Logger.overlayPanel.notice("Appearance manager cannot change appearance. \(actionMessage)")
+            return nil
+        }
         guard !appState.isActiveSpaceFullscreen else {
             Logger.overlayPanel.notice("Active space is fullscreen. \(actionMessage)")
             return nil
         }
+        let owningDisplay = owningScreen.displayID
         guard AccessibilityMenuBar.hasValidMenuBar(for: owningDisplay) else {
             Logger.overlayPanel.notice("No valid menu bar found. \(actionMessage)")
             return nil

Diff for: Ice/Settings/SettingsPanes/MenuBarAppearanceSettingsPane/MenuBarAppearanceEditor.swift

@@ -35,7 +35,7 @@ struct MenuBarAppearanceEditor: View {
 
     @ViewBuilder
     private var stackBody: some View {
-        if appearanceManager.canEditAppearance {
+        if appearanceManager.canChangeAppearance {
             mainForm
         } else {
             cannotEdit
@@ -46,7 +46,7 @@ struct MenuBarAppearanceEditor: View {
     private var stackFooter: some View {
         HStack {
             if
-                appearanceManager.canEditAppearance,
+                appearanceManager.canChangeAppearance,
                 appearanceManager.configuration != .defaultConfiguration
             {
                 Button("Reset") {