Compare commits

...

9 Commits

Author SHA1 Message Date
Anthony
2d77a2377d add element id in item render_page items instead 2025-10-09 12:43:24 -04:00
Anthony
9e1f9c74c0 upper case all lsp references in titles and descriptions 2025-10-09 12:33:41 -04:00
Anthony
e0be758308 Fix some settings ui elements having duplicate ids 2025-10-09 12:29:21 -04:00
Anthony
bb31a97e22 Deduplicate terminal settings and fix dropdown toggle bug 2025-10-09 12:02:56 -04:00
Anthony
08b73d0943 Merge remote-tracking branch 'origin/main' into settings-ui-elements 2025-10-09 11:16:43 -04:00
Anthony
f2b1dd262c Merge conflicts 2025-10-09 11:12:09 -04:00
Anthony
898af2e75d Merge remote-tracking branch 'origin/main' into settings-ui-elements 2025-10-07 22:08:14 -04:00
Anthony
e34526534f Add Cursor Shape 2025-10-07 22:07:53 -04:00
Anthony
e3f4fee4d5 Add more terminal settings 2025-10-07 17:37:37 -04:00
2 changed files with 5 additions and 4 deletions

View File

@@ -5279,7 +5279,7 @@ fn language_settings_data() -> Vec<SettingsPageItem> {
files: USER | LOCAL, files: USER | LOCAL,
}), }),
SettingsPageItem::SettingItem(SettingItem { SettingsPageItem::SettingItem(SettingItem {
title: "Lsp", title: "LSP",
description: "Whether to fetch LSP completions or not", description: "Whether to fetch LSP completions or not",
field: Box::new(SettingField { field: Box::new(SettingField {
pick: |settings_content| { pick: |settings_content| {
@@ -5301,7 +5301,7 @@ fn language_settings_data() -> Vec<SettingsPageItem> {
files: USER | LOCAL, files: USER | LOCAL,
}), }),
SettingsPageItem::SettingItem(SettingItem { SettingsPageItem::SettingItem(SettingItem {
title: "Lsp Fetch Timeout Ms", title: "LSP Fetch Timeout Ms",
description: "When fetching LSP completions, determines how long to wait for a response of a particular server (set to 0 to wait indefinitely)", description: "When fetching LSP completions, determines how long to wait for a response of a particular server (set to 0 to wait indefinitely)",
field: Box::new(SettingField { field: Box::new(SettingField {
pick: |settings_content| { pick: |settings_content| {
@@ -5326,7 +5326,7 @@ fn language_settings_data() -> Vec<SettingsPageItem> {
files: USER | LOCAL, files: USER | LOCAL,
}), }),
SettingsPageItem::SettingItem(SettingItem { SettingsPageItem::SettingItem(SettingItem {
title: "Lsp Insert Mode", title: "LSP Insert Mode",
description: "Controls how LSP completions are inserted", description: "Controls how LSP completions are inserted",
field: Box::new(SettingField { field: Box::new(SettingField {
pick: |settings_content| { pick: |settings_content| {
@@ -5616,7 +5616,7 @@ fn language_settings_data() -> Vec<SettingsPageItem> {
files: USER | LOCAL, files: USER | LOCAL,
}), }),
SettingsPageItem::SettingItem(SettingItem { SettingsPageItem::SettingItem(SettingItem {
title: "Prefer Lsp", title: "Prefer LSP",
description: "Use LSP tasks over Zed language extension ones", description: "Use LSP tasks over Zed language extension ones",
field: Box::new(SettingField { field: Box::new(SettingField {
pick: |settings_content| { pick: |settings_content| {

View File

@@ -1729,6 +1729,7 @@ impl SettingsWindow {
v_flex() v_flex()
.w_full() .w_full()
.min_w_0() .min_w_0()
.id(("settings-page-item", actual_item_index))
.when_some(page_index, |element, page_index| { .when_some(page_index, |element, page_index| {
element.track_focus( element.track_focus(
&self.content_handles[page_index][actual_item_index] &self.content_handles[page_index][actual_item_index]