Don't include disabled items in application menu frame

jordanbaird · Jul 4, 2024 · f9daa2a · f9daa2a
1 parent 09b5fb7
commit f9daa2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Ice/Accessibility/AccessibilityMenuBarItem.swift b/Ice/Accessibility/AccessibilityMenuBarItem.swift
@@ -12,6 +12,11 @@ struct AccessibilityMenuBarItem {
     /// The underyling UI element.
     let uiElement: UIElement
 
+    /// A Boolean value that indicates whether the menu bar item is enabled.
+    var isEnabled: Bool {
+        (try? uiElement.attribute(.enabled)) == true
+    }
+
     /// Creates an accessibility menu bar item from the given UI element.
     ///
     /// - Parameter uiElement: A UI element that represents a menu bar item.

diff --git a/Ice/MenuBar/MenuBarManager.swift b/Ice/MenuBar/MenuBarManager.swift
@@ -287,7 +287,9 @@ final class MenuBarManager: ObservableObject {
         var menuBarFrame = try menuBar.frame()
         menuBarFrame.origin = CGDisplayBounds(display).origin
         menuBarFrame.size.width = try menuBar.menuBarItems().reduce(into: 0) { width, item in
-            try width += item.frame().width
+            if item.isEnabled {
+                try width += item.frame().width
+            }
         }
         if menuBarFrame.width == .zero {
             return menuBarFrame