Skip to content

fix(#1540): fix default selection in settings #1547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thecoolwinter merged 2 commits into from
Jan 9, 2024
Merged

fix(#1540): fix default selection in settings #1547

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec7611e
fix(#1540): fix default selection in settings
RayZhao1998 Jan 6, 2024
5fe5a31
fix(#1546): cancel capitalized for settings search results
RayZhao1998 Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions CodeEdit/Features/Settings/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
}
}
Expand All @@ -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 {
Expand Down