- Removed old custom keyboard handling

Author: georgetchelidze

Sources/WelcomeWindow/Views/WelcomeButton.swift

@@ -35,17 +35,33 @@ public struct WelcomeButton: View {
         })
         .buttonStyle(WelcomeActionButtonStyle())
         .focused($isfocused)
-        .modifier(FocusRingModifier(isFocused: isfocused, shape: .rect(cornerRadius: 8)))
+        .modifier(FocusRingModifier(isFocused: isfocused, shape: buttonShape))
+    }
+
+    private var buttonShape: some InsettableShape {
+        if #available(macOS 26, *) {
+            return .capsule
+        } else {
+            return .rect(cornerRadius: 8)
+        }
     }
 }
 
 struct WelcomeActionButtonStyle: ButtonStyle {
     func makeBody(configuration: Configuration) -> some View {
-        configuration.label
-            .contentShape(Rectangle())
-            .padding(7)
-            .frame(height: 36)
-            .background(Color(.labelColor).opacity(configuration.isPressed ? 0.1 : 0.05))
-            .clipShape(RoundedRectangle(cornerRadius: 8))
+        @ViewBuilder var buttonBody: some View {
+            let base = configuration.label
+                .contentShape(Rectangle())
+                .padding(7)
+                .frame(height: 36)
+                .background(Color(.labelColor).opacity(configuration.isPressed ? 0.1 : 0.05))
+
+            if #available(macOS 26, *) {
+                base.clipShape(Capsule())
+            } else {
+                base.clipShape(RoundedRectangle(cornerRadius: 8))
+            }
+        }
+        return buttonBody
     }
 }

Sources/WelcomeWindow/Views/WelcomeWindow.swift

@@ -36,40 +36,7 @@ public struct WelcomeWindow<RecentsView: View, SubtitleView: View>: Scene {
     }
 
     public var body: some Scene {
-        #if swift(>=5.9)
-        if #available(macOS 15, *) {
-            return Window("Welcome To \(Bundle.displayName)", id: DefaultSceneID.welcome) {
-                WelcomeWindowView(
-                    iconImage: iconImage,
-                    title: title,
-                    subtitleView: subtitleView,
-                    buildActions: buildActions,
-                    onDrop: onDrop,
-                    customRecentsList: customRecentsList
-                )
-                .frame(width: 740, height: 460)
-                .task {
-                    if let window = NSApp.findWindow(DefaultSceneID.welcome) {
-                        window.standardWindowButton(.closeButton)?.isHidden = true
-                        window.standardWindowButton(.miniaturizeButton)?.isHidden = true
-                        window.standardWindowButton(.zoomButton)?.isHidden = true
-                        window.hasShadow = true
-                        window.isMovableByWindowBackground = true
-                    }
-                }
-            }
-            .windowStyle(.plain)
-            .windowResizability(.contentSize)
-            .defaultLaunchBehavior(.presented)
-        } else {
-            return legacyWindow
-        }
-        #else
-        return legacyWindow
-        #endif
-    }
 
-    private var legacyWindow: some Scene {
         Window("Welcome To \(Bundle.displayName)", id: DefaultSceneID.welcome) {
             WelcomeWindowView(
                 iconImage: iconImage,
@@ -79,20 +46,20 @@ public struct WelcomeWindow<RecentsView: View, SubtitleView: View>: Scene {
                 onDrop: onDrop,
                 customRecentsList: customRecentsList
             )
-            .frame(width: 740, height: 432)
+            .frame(width: 740, height: 460)
             .task {
                 if let window = NSApp.findWindow(DefaultSceneID.welcome) {
-                    window.styleMask.insert(.borderless)
+                    window.styleMask.insert(.fullSizeContentView)
                     window.standardWindowButton(.closeButton)?.isHidden = true
                     window.standardWindowButton(.miniaturizeButton)?.isHidden = true
                     window.standardWindowButton(.zoomButton)?.isHidden = true
-                    window.backgroundColor = .clear
+                    window.hasShadow = true
                     window.isMovableByWindowBackground = true
                 }
             }
         }
-        .windowStyle(.hiddenTitleBar)
         .windowResizability(.contentSize)
+        .windowStyle(.hiddenTitleBar)
     }
 }
 

Sources/WelcomeWindow/Views/WelcomeWindowView.swift

@@ -18,10 +18,8 @@ public struct WelcomeWindowView<RecentsView: View, SubtitleView: View>: View {
 
     @FocusState private var focusedField: FocusTarget?
 
-    @State private var eventMonitor: Any?
     @State private var recentProjects: [URL] = RecentsStore.recentProjectURLs()
     @State private var selection: Set<URL> = []
-    @State private var actionCount: Int = 0
 
     private let buildActions: (_ dismissWindow: @escaping () -> Void) -> WelcomeActions
     private let onDrop: ((_ url: URL, _ dismiss: @escaping () -> Void) -> Void)?
@@ -95,32 +93,10 @@ public struct WelcomeWindowView<RecentsView: View, SubtitleView: View>: View {
                 selection = [recentProjects[0]]
             }
 
-            // Determine how many actions are defined
-            switch actions {
-            case .none:
-                actionCount = 0
-            case .one:
-                actionCount = 1
-            case .two:
-                actionCount = 2
-            case .three:
-                actionCount = 3
-            }
-
             // Initial focus
             focusedField = .recentProjects
-
-            // Monitor key input
-            self.eventMonitor = NSEvent.addLocalMonitorForEvents(matching: [.keyDown]) { event in
-                return handleKeyDown(event)
-            }
-        }
-        .onDisappear {
-            if let monitor = eventMonitor {
-                NSEvent.removeMonitor(monitor)
-                eventMonitor = nil
-            }
         }
+
         .onDrop(of: [.fileURL], isTargeted: .constant(true)) { providers in
             NSApp.activate(ignoringOtherApps: true)
             providers.forEach {
@@ -135,90 +111,4 @@ public struct WelcomeWindowView<RecentsView: View, SubtitleView: View>: View {
             return true
         }
     }
-
-    // MARK: - Keyboard Handling
-
-    private func handleKeyDown(_ event: NSEvent) -> NSEvent? {
-
-        // cmd+W
-        if event.modifierFlags.contains(.command), event.keyCode == 13 {
-            dismissWindow()
-            return nil
-        }
-
-        switch event.keyCode {
-        case 126: // Arrow Up
-            if focusedField == .recentProjects {
-                return handleArrowUp() ? nil : event
-            }
-        case 125: // Arrow Down
-            if focusedField == .recentProjects {
-                return handleArrowDown() ? nil : event
-            }
-        case 36, 76: // Return / Enter
-            if focusedField == .recentProjects {
-                return handleReturnKey() ? nil : event
-            } else if focusedField == .dismissButton {
-                dismissWindow()
-                return nil
-            }
-        case 48: // Tab
-            switchFocus()
-            return nil
-        default:
-            break
-        }
-        return event
-    }
-
-    private func handleArrowUp() -> Bool {
-        guard let current = selection.first.flatMap({ recentProjects.firstIndex(of: $0) }) else {
-            selection = Set(recentProjects.suffix(1))
-            return true
-        }
-        if current > 0 {
-            selection = [recentProjects[current - 1]]
-        }
-        return true
-    }
-
-    private func handleArrowDown() -> Bool {
-        guard let current = selection.first.flatMap({ recentProjects.firstIndex(of: $0) }) else {
-            selection = Set(recentProjects.prefix(1))
-            return true
-        }
-        if current < recentProjects.count - 1 {
-            selection = [recentProjects[current + 1]]
-        }
-        return true
-    }
-
-    private func handleReturnKey() -> Bool {
-        guard let selected = selection.first else { return false }
-        NSDocumentController.shared.openDocument(at: selected) {
-            dismissWindow()
-        }
-        return true
-    }
-
-    private func switchFocus() {
-        let focusOrder: [FocusTarget] = {
-            var order: [FocusTarget] = [.dismissButton]
-            if actionCount >= 1 { order.append(.action1) }
-            if actionCount >= 2 { order.append(.action2) }
-            if actionCount >= 3 { order.append(.action3) }
-            order.append(.recentProjects)
-            return order
-        }()
-
-        guard let current = focusedField,
-              let currentIndex = focusOrder.firstIndex(of: current) else {
-            focusedField = .dismissButton // start at dismiss
-            return
-        }
-
-        let nextIndex = (currentIndex + 1) % focusOrder.count
-        focusedField = focusOrder[nextIndex]
-    }
-
 }