Refactor menu padding for application menu frame

jordanbaird · Jul 20, 2024 · a72d8a0 · a72d8a0
1 parent bd66430
commit a72d8a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/Ice/Events/EventManager.swift b/Ice/Events/EventManager.swift
@@ -459,10 +459,11 @@ extension EventManager {
             let mouseLocation = MouseCursor.location(flipped: true),
             let screen = bestScreen,
             let appState,
-            let applicationMenuFrame = appState.menuBarManager.getApplicationMenuFrame(for: screen.displayID)
+            var applicationMenuFrame = appState.menuBarManager.getApplicationMenuFrame(for: screen.displayID)
         else {
             return false
         }
+        applicationMenuFrame.size.width += 15 // extra width to accomodate menu padding
         return applicationMenuFrame.contains(mouseLocation)
     }
 

diff --git a/Ice/MenuBar/MenuBarManager.swift b/Ice/MenuBar/MenuBarManager.swift
@@ -323,7 +323,7 @@ final class MenuBarManager: ObservableObject {
         }
 
         let itemFrames = items.lazy.compactMap { try? $0.attribute(.frame) as CGRect? }
-        var applicationMenuFrame = itemFrames.reduce(.null, CGRectUnion)
+        let applicationMenuFrame = itemFrames.reduce(.null, CGRectUnion)
 
         if applicationMenuFrame.width <= 0 {
             return nil
@@ -344,9 +344,6 @@ final class MenuBarManager: ObservableObject {
             return nil
         }
 
-        // add extra width to accomodate menu padding
-        applicationMenuFrame.size.width += 15
-
         return applicationMenuFrame
     }
 

diff --git a/Ice/MenuBarAppearance/MenuBarOverlayPanel.swift b/Ice/MenuBarAppearance/MenuBarOverlayPanel.swift
@@ -531,12 +531,12 @@ private class MenuBarOverlayPanelContentView: NSView {
                 return .zero
             }
             if shouldInset {
-                maxX -= 5
+                maxX += 10
                 if info.leading.leadingEndCap == .square {
                     maxX += appearanceManager.menuBarInsetAmount
                 }
             } else {
-                maxX += 5
+                maxX += 20
             }
             return CGRect(x: rect.minX, y: rect.minY, width: maxX, height: rect.height)
         }()