Skip to content

Commit 24143af

Browse files
committed
Minor
1 parent 732927b commit 24143af

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

Sources/AppBundle/command/impl/DebugWindowsCommand.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct DebugWindowsCommand: Command {
4242
switch debugWindowsState {
4343
case .recording:
4444
debugWindowsState = .notRecording
45-
io.out(debugWindowsLog.values + ["\n"])
45+
io.out(debugWindowsLog.values.joined(separator: "\n\n") + "\n")
4646
io.out(disclaimer + "\n")
4747
io.out("Debug session finished" + "\n")
4848
debugWindowsLog = [:]

Sources/AppBundle/tree/MacWindow.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,11 @@ final class MacWindow: Window, CustomStringConvertible {
8686
case .tilingContainer, .workspace, .macosHiddenAppsWindowsContainer, .macosFullscreenWindowsContainer:
8787
let deadWindowFocus = deadWindowWorkspace.toLiveFocus()
8888
_ = setFocus(to: deadWindowFocus)
89+
// Guard against "Apple Reminders popup" bug: https://github.com/nikitabobko/AeroSpace/issues/201
8990
if focus.windowOrNil?.app != app {
90-
deadWindowFocus.windowOrNil?.nativeFocus() // force focus
91+
// Force focus to fix macOS annoyance with focused apps without windows.
92+
// https://github.com/nikitabobko/AeroSpace/issues/65
93+
deadWindowFocus.windowOrNil?.nativeFocus()
9194
}
9295
case .macosPopupWindowsContainer, .macosMinimizedWindowsContainer:
9396
break // Don't switch back on popup destruction
@@ -309,7 +312,7 @@ func isDialogHeuristic(_ axWindow: AXUIElement, _ app: MacApp) -> Bool {
309312
return true
310313
}
311314
// Firefox: Picture in Picture window doesn't have minimize button.
312-
// todo. bug: when firefox shows non-native fullscreen, minimize button disables for all other windows
315+
// todo. bug: when firefox shows non-native fullscreen, minimize button is disabled for all other windows
313316
if app.isFirefox() && axWindow.get(Ax.minimizeButtonAttr)?.get(Ax.enabledAttr) != true {
314317
return true
315318
}

Sources/Common/cmdHelpGenerated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let config_help_generated = """
1717
OR: config [-h|--help] --config-path
1818
"""
1919
let debug_windows_help_generated = """
20-
USAGE: debug-windows [-h|--help]
20+
USAGE: debug-windows [-h|--help] [--window-id <window-id>]
2121
"""
2222
let enable_help_generated = """
2323
USAGE: enable [-h|--help] toggle

Sources/Common/util/commonUtil.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public func errorT<T>(
2525
Message: \(_message)
2626
Version: \(aeroSpaceAppVersion)
2727
Git hash: \(gitHash)
28-
Date: \(Date())
28+
Date: \(Date.now)
2929
macOS version: \(ProcessInfo().operatingSystemVersionString)
3030
Coordinate: \(file):\(line):\(column) \(function)
3131
recursionDetectorDuringFailure: \(recursionDetectorDuringFailure)

docs/aerospace-debug-windows.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include::util/man-attributes.adoc[]
99
== Synopsis
1010
[verse]
1111
// tag::synopsis[]
12-
aerospace debug-windows [-h|--help]
12+
aerospace debug-windows [-h|--help] [--window-id <window-id>]
1313

1414
// end::synopsis[]
1515

run-tests.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
cd "$(dirname "$0")"
33
source ./script/setup.sh
44

5-
# ./build-debug.sh || exit 125 # `git bisect run` compatible
5+
./build-debug.sh
66
swift test
77

8-
./run-cli.sh -h
9-
./run-cli.sh -v
8+
./.debug/aerospace -h > /dev/null
9+
./.debug/aerospace --help > /dev/null
10+
./.debug/aerospace -v | grep -q "0.0.0-SNAPSHOT SNAPSHOT"
11+
./.debug/aerospace --version | grep -q "0.0.0-SNAPSHOT SNAPSHOT"
1012

1113
./script/install-dep.sh --swiftlint
1214
./.deps/swiftlint/swiftlint lint --quiet

0 commit comments

Comments
 (0)