From d3b18dac5d86dc5a52993598cc2518202cce49c2 Mon Sep 17 00:00:00 2001
From: Jeder <jeder+git@jeder.pl>
Date: Thu, 3 Aug 2023 19:04:06 +0200
Subject: [PATCH] Replace Deck UI "Default navigation behavior" switch with
 radio buttons

---
 locales/en-US.yml                           |  1 +
 packages/client/src/pages/settings/deck.vue | 11 ++++++-----
 packages/client/src/ui/deck.vue             |  2 +-
 packages/client/src/ui/deck/deck-store.ts   |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 7e48d8575..e6435921f 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1127,6 +1127,7 @@ removeQuote: "Remove quote"
 removeRecipient: "Remove recipient"
 removeMember: "Remove member"
 verifiedLink: "Verified link"
+openInMainColumn: "Open in main column"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing
diff --git a/packages/client/src/pages/settings/deck.vue b/packages/client/src/pages/settings/deck.vue
index 99f21277f..fc18a65d6 100644
--- a/packages/client/src/pages/settings/deck.vue
+++ b/packages/client/src/pages/settings/deck.vue
@@ -1,14 +1,15 @@
 <template>
 	<div class="_formRoot">
-		<FormSwitch v-model="navWindow"
-			>{{ i18n.ts.defaultNavigationBehaviour }}:
-			{{ i18n.ts.openInWindow }}</FormSwitch
-		>
-
 		<FormSwitch v-model="alwaysShowMainColumn" class="_formBlock">{{
 			i18n.ts._deck.alwaysShowMainColumn
 		}}</FormSwitch>
 
+		<FormRadios v-model="navWindow" class="_formBlock">
+			<template #label>{{ i18n.ts.defaultNavigationBehaviour }}</template>
+			<option value="window">{{ i18n.ts.openInWindow }}</option>
+			<option value="column">{{ i18n.ts.openInMainColumn }}</option>
+		</FormRadios>
+
 		<FormRadios v-model="columnAlign" class="_formBlock">
 			<template #label>{{ i18n.ts._deck.columnAlign }}</template>
 			<option value="left">{{ i18n.ts.left }}</option>
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index d999d5a7c..e00c7ae37 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -220,7 +220,7 @@ mainRouter.navHook = (path, flag): boolean => {
 	const noMainColumn = !deckStore.state.columns.some(
 		(x) => x.type === "main",
 	);
-	if (deckStore.state.navWindow || noMainColumn) {
+	if (deckStore.reactiveState.navWindow.value === "window" || noMainColumn) {
 		os.pageWindow(path);
 		return true;
 	}
diff --git a/packages/client/src/ui/deck/deck-store.ts b/packages/client/src/ui/deck/deck-store.ts
index 0ea67b70c..b5a4e334b 100644
--- a/packages/client/src/ui/deck/deck-store.ts
+++ b/packages/client/src/ui/deck/deck-store.ts
@@ -60,7 +60,7 @@ export const deckStore = markRaw(
 		},
 		navWindow: {
 			where: "deviceAccount",
-			default: true,
+			default: "window" as "window" | "column",
 		},
 	}),
 );