Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Focus the machine table when it appears (#535)

Lakrad9ee8ecab26
diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachinesView.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachinesView.swift
index 8e068a8f..10436052 100644
--- a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachinesView.swift
+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachinesView.swift
@@ -33,6 +33,11 @@ struct VPhoneLaunchpadMachinesView: View {
@State private var filter = ""
/// Empty keeps the order `vm list` returns; a header click replaces it.
@State private var sortOrder: [KeyPathComparator<VPhoneLaunchpadMachine>] = []
+ /// The table appears only once `vm list` returns, after the window has
+ /// picked its first responder, so nothing focuses it by itself. Unfocused,
+ /// AppKit draws the library's automatic selection in gray, not in the
+ /// accent color.
+ @FocusState private var tableIsFocused: Bool
private var library: VPhoneLaunchpadMachineLibrary {
model.machines
@@ -353,6 +358,14 @@ struct VPhoneLaunchpadMachinesView: View {
} primaryAction: { paths in
start(library.machines.filter { paths.contains($0.path) && library.state(of: $0.path) == .stopped })
}
+ .focused($tableIsFocused)
+ .onAppear {
+ // The table comes back when a search matches again; the search
+ // field keeps the keyboard then.
+ if !(NSApp.keyWindow?.firstResponder is NSText) {
+ tableIsFocused = true
+ }
+ }
}
@ViewBuilder