Skip to content

Option to Use the System Cursor #1812

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
Jul 19, 2024
Merged

Option to Use the System Cursor #1812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea0e826
Option to Use the System Cursor
thecoolwinter Jul 19, 2024
102d503
Only decode on valid macos version
thecoolwinter Jul 19, 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
3 changes: 3 additions & 0 deletions CodeEdit/Features/Editor/Views/CodeFileView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ struct CodeFileView: View {
var letterSpacing
@AppSettings(\.textEditing.bracketHighlight)
var bracketHighlight
@AppSettings(\.textEditing.useSystemCursor)
var useSystemCursor

@Environment(\.colorScheme)
private var colorScheme
Expand Down Expand Up @@ -121,6 +123,7 @@ struct CodeFileView: View {
isEditable: isEditable,
letterSpacing: letterSpacing,
bracketPairHighlight: bracketPairHighlight,
useSystemCursor: useSystemCursor,
undoManager: undoManager,
coordinators: textViewCoordinators
)
Expand Down
8 changes: 8 additions & 0 deletions CodeEdit/Features/Settings/Pages/TextEditingSettings/Models/TextEditingSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ extension SettingsData {
/// The behavior of bracket pair highlights.
var bracketHighlight: BracketPairHighlight = BracketPairHighlight()

/// Use the system cursor for the source editor.
var useSystemCursor: Bool = true

/// Default initializer
init() {
self.populateCommands()
Expand Down Expand Up @@ -97,6 +100,11 @@ extension SettingsData {
BracketPairHighlight.self,
forKey: .bracketHighlight
) ?? BracketPairHighlight()
if #available(macOS 14, *) {
self.useSystemCursor = try container.decodeIfPresent(Bool.self, forKey: .useSystemCursor) ?? true
} else {
self.useSystemCursor = false
}

self.populateCommands()
}
Expand Down
9 changes: 9 additions & 0 deletions CodeEdit/Features/Settings/Pages/TextEditingSettings/TextEditingSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ struct TextEditingSettingsView: View {
indentOption
defaultTabWidth
wrapLinesToEditorWidth
useSystemCursor
}
Section {
fontSelector
Expand Down Expand Up @@ -71,6 +72,14 @@ private extension TextEditingSettingsView {
Toggle("Wrap lines to editor width", isOn: $textEditing.wrapLinesToEditorWidth)
}

@ViewBuilder private var useSystemCursor: some View {
if #available(macOS 14, *) {
Toggle("Use System Cursor", isOn: $textEditing.useSystemCursor)
} else {
EmptyView()
}
}

@ViewBuilder private var lineHeight: some View {
Stepper(
"Line Height",
Expand Down