Don't cache item images if app isn't frontmost

jordanbaird · Jul 11, 2024 · 46f3b44 · 46f3b44
1 parent aa28264
commit 46f3b44
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/Ice/Main/AppState.swift b/Ice/Main/AppState.swift
@@ -104,6 +104,16 @@ final class AppState: ObservableObject {
         }
         .store(in: &c)
 
+        NSWorkspace.shared.publisher(for: \.frontmostApplication)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] frontmostApplication in
+                guard let self else {
+                    return
+                }
+                navigationState.isAppFrontmost = frontmostApplication == .current
+            }
+            .store(in: &c)
+
         if let settingsWindow {
             settingsWindow.publisher(for: \.isVisible)
                 .receive(on: DispatchQueue.main)
@@ -116,17 +126,20 @@ final class AppState: ObservableObject {
                 .store(in: &c)
         }
 
-        navigationState.$isSettingsPresented
-            .receive(on: DispatchQueue.main)
-            .sink { isPresented in
-                guard isPresented else {
-                    return
-                }
-                Task {
-                    await self.imageCache.updateCacheWithoutChecks(sections: MenuBarSection.Name.allCases)
-                }
+        Publishers.Merge(
+            navigationState.$isAppFrontmost,
+            navigationState.$isSettingsPresented
+        )
+        .debounce(for: 0.1, scheduler: DispatchQueue.main)
+        .sink { shouldUpdate in
+            guard shouldUpdate else {
+                return
             }
-            .store(in: &c)
+            Task {
+                await self.imageCache.updateCacheWithoutChecks(sections: MenuBarSection.Name.allCases)
+            }
+        }
+        .store(in: &c)
 
         menuBarManager.objectWillChange
             .sink { [weak self] in

diff --git a/Ice/MenuBar/MenuBarItemImageCache.swift b/Ice/MenuBar/MenuBarItemImageCache.swift
@@ -207,6 +207,10 @@ class MenuBarItemImageCache: ObservableObject {
         }
 
         if !appState.navigationState.isIceBarPresented {
+            guard appState.navigationState.isAppFrontmost else {
+                Logger.imageCache.debug("Skipping image cache as Ice Bar not visible, app not frontmost")
+                return
+            }
             guard appState.navigationState.isSettingsPresented else {
                 Logger.imageCache.debug("Skipping image cache as Ice Bar not visible, Settings not visible")
                 return

diff --git a/Ice/Navigation/AppNavigationState.swift b/Ice/Navigation/AppNavigationState.swift
@@ -8,6 +8,7 @@ import Combine
 /// The model for app-wide navigation.
 @MainActor
 final class AppNavigationState: ObservableObject {
+    @Published var isAppFrontmost = false
     @Published var isSettingsPresented = false
     @Published var isIceBarPresented = false
     @Published var settingsNavigationIdentifier: SettingsNavigationIdentifier = .general