From ec7611e746d95c47a697d95c9dd9c3b965716957 Mon Sep 17 00:00:00 2001 From: Ray Zhao Date: Sat, 6 Jan 2024 22:39:54 +0800 Subject: [PATCH 1/2] fix(#1540): fix default selection in settings --- CodeEdit/Features/Settings/SettingsView.swift | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CodeEdit/Features/Settings/SettingsView.swift b/CodeEdit/Features/Settings/SettingsView.swift index 05a5d9b9a0..c865961553 100644 --- a/CodeEdit/Features/Settings/SettingsView.swift +++ b/CodeEdit/Features/Settings/SettingsView.swift @@ -15,7 +15,7 @@ struct SettingsView: View { private var colorScheme /// Variables for the selected Page, the current search text and software updater - @State private var selectedPage: SettingsPage = SettingsPage(.general) + @State private var selectedPage: SettingsPage = Self.pages[0].page @State private var searchText: String = "" @Environment(\.presentationMode) @@ -136,13 +136,8 @@ struct SettingsView: View { } } } + .searchable(text: $searchText, placement: .sidebar, prompt: "Search") .navigationSplitViewColumnWidth(215) - .safeAreaInset(edge: .top, spacing: 0) { - List {} - .frame(height: 35) - .searchable(text: $searchText, placement: .sidebar, prompt: "Search") - .scrollDisabled(true) - } } detail: { Group { switch selectedPage.name { From 5fe5a31204edae6dbc5ccb71deafe75e614f710e Mon Sep 17 00:00:00 2001 From: Ray Zhao Date: Sat, 6 Jan 2024 23:12:43 +0800 Subject: [PATCH 2/2] fix(#1546): cancel capitalized for settings search results --- CodeEdit/Features/Settings/SettingsView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodeEdit/Features/Settings/SettingsView.swift b/CodeEdit/Features/Settings/SettingsView.swift index c865961553..bacf5e2bf3 100644 --- a/CodeEdit/Features/Settings/SettingsView.swift +++ b/CodeEdit/Features/Settings/SettingsView.swift @@ -112,7 +112,7 @@ struct SettingsView: View { ForEach(results.pages, id: \.settingName) { setting in NavigationLink(value: setting) { - setting.settingName.capitalized.highlightOccurrences(searchText) + setting.settingName.highlightOccurrences(searchText) .padding(.leading, 22) } }