Improve window overlay and focus handling

Author: richiemcilroy

apps/desktop/src-tauri/src/target_select_overlay.rs

@@ -268,16 +268,11 @@ impl WindowFocusManager {
                     let cap_main = CapWindowId::Main.get(app);
                     let cap_settings = CapWindowId::Settings.get(app);
 
-                    let has_cap_main = cap_main
-                        .as_ref()
-                        .and_then(|v| Some(v.is_minimized().ok()? || !v.is_visible().ok()?))
-                        .unwrap_or(true);
-                    let has_cap_settings = cap_settings
-                        .and_then(|v| Some(v.is_minimized().ok()? || !v.is_visible().ok()?))
-                        .unwrap_or(true);
-
-                    // Close the overlay if the cap main and settings are not available.
-                    if has_cap_main && has_cap_settings {
+                    let main_window_available = cap_main.is_some();
+                    let settings_window_available = cap_settings.is_some();
+
+                    // Close the overlay if both cap windows are gone.
+                    if !main_window_available && !settings_window_available {
                         window.hide().ok();
                         break;
                     }

apps/desktop/src-tauri/src/windows.rs

@@ -224,6 +224,8 @@ impl ShowCapWindow {
         }
 
         if let Some(window) = self.id(app).get(app) {
+            window.show().ok();
+            window.unminimize().ok();
             window.set_focus().ok();
             return Ok(window);
         }

apps/desktop/src/routes/(window-chrome)/new-main/index.tsx

@@ -53,6 +53,7 @@ import {
 	type CaptureWindowWithThumbnail,
 	commands,
 	type DeviceOrModelID,
+	type RecordingTargetMode,
 	type ScreenCaptureTarget,
 } from "~/utils/tauri";
 import IconLucideAppWindowMac from "~icons/lucide/app-window-mac";
@@ -434,10 +435,13 @@ function Page() {
 	createUpdateCheck();
 
 	onMount(async () => {
-		const targetMode = (window as any).__CAP__.initialTargetMode;
+		const { __CAP__ } = window as typeof window & {
+			__CAP__?: { initialTargetMode?: RecordingTargetMode | null };
+		};
+		const targetMode = __CAP__?.initialTargetMode ?? null;
 		setOptions({ targetMode });
-		if (rawOptions.targetMode) commands.openTargetSelectOverlays(null);
-		else commands.closeTargetSelectOverlays();
+		if (targetMode) await commands.openTargetSelectOverlays(null);
+		else await commands.closeTargetSelectOverlays();
 
 		const currentWindow = getCurrentWindow();