Skip to content

Commit 26f57be

Browse files
💬 feat(web): simpler swipe setting wording, macOS-only row, docs line
Name the setting "Swipe to navigate" with a shorter description, and add back/forward to its search terms. The gesture only runs on macOS now, so show the row and its search entry only there. Mention the gesture and the switch next to navigation.back/forward in the keybindings guide.
1 parent 93fd82b commit 26f57be

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

‎apps/web/src/components/settings/SettingsPanels.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ export function useSettingsRestore(onRestored?: () => void) {
579579
: []),
580580
...(settings.confirmQuit !== DEFAULT_UNIFIED_SETTINGS.confirmQuit ? ["Quit shortcut"] : []),
581581
...(settings.historySwipeNavigation !== DEFAULT_UNIFIED_SETTINGS.historySwipeNavigation
582-
? ["Swipe to go back and forward"]
582+
? ["Swipe to navigate"]
583583
: []),
584584
...(isTextGenerationModelDirty ? ["Text generation model"] : []),
585585
...(settings.threadTitleInstructions !== DEFAULT_UNIFIED_SETTINGS.threadTitleInstructions
@@ -919,15 +919,12 @@ export function GeneralSettingsPanel() {
919919
/>
920920
</SettingsSection>
921921

922-
{isElectron ? (
922+
{isElectron && isMacPlatform(navigator.platform) ? (
923923
<SettingsSection id="navigation" title={gt("Navigation")}>
924924
<SettingsRow
925925
{...setting("history-swipe-navigation")}
926926
description={
927-
<T>
928-
Two-finger horizontal swipes move through your thread history. Turn off if a mouse
929-
with a horizontal wheel switches threads by accident.
930-
</T>
927+
<T>Swipe horizontally with two fingers on a trackpad to go back or forward.</T>
931928
}
932929
resetAction={
933930
settings.historySwipeNavigation !==
@@ -948,7 +945,7 @@ export function GeneralSettingsPanel() {
948945
onCheckedChange={(checked) =>
949946
updateSettings({ historySwipeNavigation: Boolean(checked) })
950947
}
951-
aria-label={gt("Swipe to go back and forward")}
948+
aria-label={gt("Swipe to navigate")}
952949
/>
953950
}
954951
/>

‎apps/web/src/components/settings/settingsSearch.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,10 +848,13 @@ export const SETTINGS_SEARCH_ITEMS = [
848848
},
849849
{
850850
id: "history-swipe-navigation",
851-
title: "Swipe to go back and forward",
851+
title: msg("Swipe to navigate"),
852852
to: "/settings/general",
853-
searchTerms: ["two-finger horizontal trackpad gesture mouse wheel thread history navigation"],
853+
searchTerms: [
854+
"two-finger horizontal trackpad gesture mouse wheel back forward thread history navigation",
855+
],
854856
desktopOnly: true,
857+
macOnly: true,
855858
},
856859
{
857860
id: "text-generation-model",

‎docs/user/keybindings.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ field gets its own undo back. Terminals always keep their native shortcut.
184184

185185
`navigation.back` (`mod+[` by default) and `navigation.forward` (`mod+]`) move
186186
through the pages you have visited, like a browser's back and forward buttons.
187+
In the desktop app on macOS, a two-finger trackpad swipe does the same. Turn it off
188+
with **Settings → General → Navigation → Swipe to navigate**.
187189

188190
`chat.new` may ask you to choose a project when there is more than one.
189191
`chat.newLocal` skips that chooser. Both use your

0 commit comments

Comments
 (0)