From ed43ee83789cb99b1cb95db340fee939dd0dedec Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 05 Jun 2026 02:07:17 +0800
Subject: [PATCH] Add final 7.8.14 App Store submission package
---
Scripts/window_logic_qa.sh | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 151 insertions(+), 19 deletions(-)
diff --git a/Scripts/window_logic_qa.sh b/Scripts/window_logic_qa.sh
index 4a333b0..d30af67 100755
--- a/Scripts/window_logic_qa.sh
+++ b/Scripts/window_logic_qa.sh
@@ -97,6 +97,22 @@
osascript -e 'tell application "System Events" to keystroke space using {option down, shift down}'
}
+send_quick_search_hotkey() {
+ swift - <<'SWIFT' >/dev/null 2>&1
+import CoreGraphics
+import Foundation
+
+let source = CGEventSource(stateID: .hidSystemState)
+let down = CGEvent(keyboardEventSource: source, virtualKey: 49, keyDown: true)!
+down.flags = [.maskSecondaryFn]
+down.post(tap: .cghidEventTap)
+usleep(80_000)
+let up = CGEvent(keyboardEventSource: source, virtualKey: 49, keyDown: false)!
+up.flags = [.maskSecondaryFn]
+up.post(tap: .cghidEventTap)
+SWIFT
+}
+
send_cmd_comma() {
osascript -e 'tell application "System Events" to keystroke "," using {command down}'
}
@@ -331,6 +347,20 @@
)"
read -r x y <<<"$coords"
click_xy "$x" "$y"
+}
+
+open_overlay_from_dock_with_retry() {
+ local output=""
+ for _ in {1..3}; do
+ click_taglauncher_dock_tile
+ sleep 0.8
+ if output="$(wait_swift_assert overlay 2>&1)"; then
+ printf '%s\n' "$output"
+ return 0
+ fi
+ done
+ printf '%s\n' "$output" >&2
+ return 1
}
assert_frontmost_taglauncher() {
@@ -767,6 +797,25 @@
let overlayWidth = dimension(overlayBounds, "Width")
let overlayHeight = dimension(overlayBounds, "Height")
print("\(Int(round(overlayX + overlayWidth / 2))) \(Int(round(overlayY + overlayHeight / 2)))")
+case "quick-search-result":
+ guard let quickSearch = tag.first(where: { window in
+ let name = (window[kCGWindowName as String] as? String) ?? ""
+ let bounds = window[kCGWindowBounds as String] as? NSDictionary ?? [:]
+ let width = dimension(bounds, "Width")
+ let height = dimension(bounds, "Height")
+ return name.isEmpty
+ && width >= 500
+ && width <= 900
+ && height >= 120
+ && height <= 850
+ }), let bounds = quickSearch[kCGWindowBounds as String] as? NSDictionary else {
+ fputs("FAIL: could not find quick search result-list bounds\n", stderr)
+ exit(1)
+ }
+ let x = dimension(bounds, "X")
+ let y = dimension(bounds, "Y")
+ let width = dimension(bounds, "Width")
+ print("\(Int(round(x + width * 0.35))) \(Int(round(y + 190)))")
case "fullscreen-target-center":
guard let target = raw.first(where: { ($0[kCGWindowName as String] as? String) == "TagLauncherFullscreenQATargetFullscreen" }),
let bounds = target[kCGWindowBounds as String] as? NSDictionary else {
@@ -980,16 +1029,51 @@
return 1
}
+open_quick_search_with_retry() {
+ local output=""
+ for _ in {1..3}; do
+ send_quick_search_hotkey
+ sleep 0.8
+ if output="$(wait_swift_assert quick-search 2>&1)"; then
+ printf '%s\n' "$output"
+ return 0
+ fi
+ done
+ printf '%s\n' "$output" >&2
+ return 1
+}
+
+open_appgrid_quick_search_with_retry() {
+ local output=""
+ for _ in {1..3}; do
+ send_keycode 49
+ sleep 0.4
+ if output="$(wait_swift_assert quick-search 2>&1)"; then
+ printf '%s\n' "$output"
+ return 0
+ fi
+ done
+ printf '%s\n' "$output" >&2
+ return 1
+}
+
assert_fullscreen_overlay_stable() {
local output=""
+ local consecutive_successes=0
for _ in {1..20}; do
- if ! output="$(swift "$assert_swift" fullscreen-overlay 2>&1)"; then
- printf '%s\n' "$output" >&2
- return 1
+ if output="$(swift "$assert_swift" fullscreen-overlay 2>&1)"; then
+ consecutive_successes=$((consecutive_successes + 1))
+ if [[ "$consecutive_successes" -ge 6 ]]; then
+ printf '%s\n' "$output"
+ return 0
+ fi
+ else
+ consecutive_successes=0
fi
sleep 0.1
done
- printf '%s\n' "$output"
+ printf '%s\n' "$output" >&2
+ return 1
}
show_overlay() {
@@ -1024,6 +1108,36 @@
coords="$(swift "$coords_swift" overlay-outside)"
read -r x y <<<"$coords"
click_xy "$x" "$y"
+}
+
+hover_quick_search_results() {
+ local coords x y
+ coords="$(quick_search_result_coords_with_retry)"
+ read -r x y <<<"$coords"
+ for offset in 0 8 16 8 0; do
+ move_xy "$x" "$((y + offset))"
+ sleep 0.08
+ done
+}
+
+click_quick_search_result() {
+ local coords x y
+ coords="$(quick_search_result_coords_with_retry)"
+ read -r x y <<<"$coords"
+ click_xy "$x" "$y"
+}
+
+quick_search_result_coords_with_retry() {
+ local output
+ for _ in {1..8}; do
+ if output="$(swift "$coords_swift" quick-search-result 2>&1)"; then
+ printf '%s\n' "$output"
+ return 0
+ fi
+ sleep 0.15
+ done
+ printf '%s\n' "$output" >&2
+ return 1
}
page_scroll_appgrid() {
@@ -1127,9 +1241,7 @@
assert_single_dock_tile
swift_assert no-overlay
log "==> QA Dock reopen: showDockIcon=true opens App Grid from explicit app reopen"
-click_taglauncher_dock_tile
-sleep 1.0
-wait_swift_assert overlay
+open_overlay_from_dock_with_retry
send_keycode 53
sleep 0.4
wait_swift_assert no-overlay
@@ -1144,6 +1256,32 @@
send_keycode 53
sleep 0.4
wait_swift_assert no-overlay
+kill_all_taglauncher_instances
+sleep 0.4
+swift_assert no-overlay
+prepare_isolated_app_instance
+assert_no_dock_tile
+log "==> QA hidden Dock: Fn+Space Quick Search hover does not resurrect App Grid"
+open_quick_search_with_retry
+hover_quick_search_results
+sleep 0.8
+wait_swift_assert quick-search
+assert_no_dock_tile
+send_quick_search_hotkey
+sleep 0.8
+wait_swift_assert no-overlay
+assert_no_dock_tile
+kill_all_taglauncher_instances
+sleep 0.4
+swift_assert no-overlay
+prepare_isolated_app_instance
+assert_no_dock_tile
+log "==> QA hidden Dock: clicking Quick Search result closes without showing App Grid"
+open_quick_search_with_retry
+click_quick_search_result
+sleep 1.4
+wait_swift_assert no-overlay
+assert_no_dock_tile
kill_all_taglauncher_instances
sleep 0.4
swift_assert no-overlay
@@ -1162,8 +1300,7 @@
wait_swift_assert fullscreen-overlay
assert_fullscreen_overlay_stable
log "==> QA fullscreen Space: quick search from appgrid does not switch Space"
- send_keycode 49
- sleep 0.4
+ open_appgrid_quick_search_with_retry
assert_fullscreen_overlay_stable
send_keycode 53
sleep 0.3
@@ -1195,8 +1332,7 @@
swift_assert overlay
log "==> QA 1/7 and 4/7: settings floats above appgrid and quick search"
-send_keycode 49
-sleep 0.4
+open_appgrid_quick_search_with_retry
send_cmd_comma
sleep 0.7
swift_assert settings
@@ -1209,14 +1345,13 @@
swift_assert file-panel
send_keycode 53
sleep 0.3
-send_cmd_w
+close_settings_window
sleep 0.9
swift_assert overlay
assert_frontmost_taglauncher
log "==> QA 4/7 and 5/7: appgrid-space quick search and double-Esc behavior"
-send_keycode 49
-sleep 0.4
+open_appgrid_quick_search_with_retry
send_keycode 53
sleep 0.4
swift_assert overlay
@@ -1228,9 +1363,7 @@
show_overlay
for _ in {1..5}; do
page_scroll_appgrid
- send_keycode 49
- sleep 0.35
- swift_assert quick-search
+ open_appgrid_quick_search_with_retry
send_keycode 53
sleep 0.25
swift_assert overlay
@@ -1242,8 +1375,7 @@
log "==> QA 5/7: clicking outside quick search closes search, not appgrid"
show_overlay
-send_keycode 49
-sleep 0.4
+open_appgrid_quick_search_with_retry
click_overlay_outside_quick_search
sleep 0.4
swift_assert overlay
--
Gitblit v1.9.3