Adjust code around window titles code just a bit

Author: mtsgrd

apps/desktop/src/lib/backend/backend.ts

@@ -69,6 +69,10 @@ export interface IBackend {
 	 * Loads a disk store from a file.
 	 */
 	loadDiskStore: (fileName: string) => Promise<DiskStore>;
+	/**
+	 * Gets the window title.
+	 */
+	getWindowTitle: () => Promise<string>;
 	/**
 	 * Sets the window title.
 	 */

apps/desktop/src/lib/backend/tauri.ts

@@ -23,6 +23,7 @@ import type { EventCallback, EventName } from '@tauri-apps/api/event';
 export default class Tauri implements IBackend {
 	platformName = platform();
 	private appWindow: Window | undefined;
+
 	systemTheme = readable<string | null>(null, (set) => {
 		if (!this.appWindow) {
 			this.appWindow = getCurrentWindow();
@@ -35,6 +36,7 @@ export default class Tauri implements IBackend {
 			set(e.payload);
 		});
 	});
+
 	invoke = tauriInvoke;
 	listen = tauriListen;
 	checkUpdate = tauriCheck;
@@ -47,18 +49,29 @@ export default class Tauri implements IBackend {
 	getAppInfo = tauriGetAppInfo;
 	readTextFromClipboard = tauriReadText;
 	writeTextToClipboard = tauriWriteText;
+
 	async filePicker<T extends OpenDialogOptions>(options?: T) {
 		return await filePickerTauri<T>(options);
 	}
+
 	async homeDirectory(): Promise<string> {
 		// TODO: Find a workaround to avoid this dynamic import
 		// https://github.com/sveltejs/kit/issues/905
 		return await (await import('@tauri-apps/api/path')).homeDir();
 	}
+
 	async loadDiskStore(fileName: string): Promise<DiskStore> {
 		const store = await Store.load(fileName, { autoSave: true });
 		return new TauriDiskStore(store);
 	}
+
+	async getWindowTitle(): Promise<string> {
+		if (!this.appWindow) {
+			this.appWindow = getCurrentWindow();
+		}
+		return await this.appWindow.title();
+	}
+
 	setWindowTitle(title: string): void {
 		if (!this.appWindow) {
 			this.appWindow = getCurrentWindow();

apps/desktop/src/lib/backend/web.ts

@@ -32,6 +32,11 @@ export default class Web implements IBackend {
 		// For the web version, we don't have a disk store, so we return a no-op implementation
 		return new WebDiskStore();
 	}
+
+	async getWindowTitle(): Promise<string> {
+		return await Promise.resolve(document.title);
+	}
+
 	setWindowTitle(title: string): void {
 		document.title = title;
 	}

apps/desktop/src/routes/+layout.svelte

@@ -74,13 +74,6 @@
 	const shortcutService = inject(SHORTCUT_SERVICE);
 	$effect(() => shortcutService.listen());
 
-	// Reset window title when not in a project
-	$effect(() => {
-		if (!projectId) {
-			backend.setWindowTitle('GitButler');
-		}
-	});
-
 	// =============================================================================
 	// ANALYTICS & NAVIGATION
 	// =============================================================================
@@ -176,6 +169,10 @@
 	onkeydown={handleKeyDown}
 />
 
+<svelte:head>
+	<title>GitButler</title>
+</svelte:head>
+
 <div class="app-root" role="application" oncontextmenu={(e) => !dev && e.preventDefault()}>
 	{@render children()}
 </div>

apps/desktop/src/routes/[projectId]/+layout.svelte

@@ -174,11 +174,17 @@
 
 	const backend = inject(BACKEND);
 	$effect(() => {
-		if (currentProject?.title) {
-			backend.setWindowTitle(`${currentProject.title} — GitButler`);
-		} else {
-			backend.setWindowTitle('GitButler');
-		}
+		let windowTitle: string;
+		const projectTitle = currentProject?.title;
+
+		backend.getWindowTitle().then((value) => {
+			windowTitle = value;
+			if (projectTitle) backend.setWindowTitle(`${projectTitle} — ${value}`);
+		});
+
+		return () => {
+			if (windowTitle) backend.setWindowTitle(windowTitle);
+		};
 	});
 
 	// =============================================================================