Skip to content

Fixed delay in synchronization of font size increment and decrement #1609

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
austincondiff merged 3 commits into from
Mar 11, 2024
Merged

Fixed delay in synchronization of font size increment and decrement #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7d1e52
Fix font resize #1396
ibrahimcetin Mar 10, 2024
995498b
Improve readability
ibrahimcetin Mar 10, 2024
fabaffd
Remove deprecated code
ibrahimcetin Mar 10, 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
21 changes: 5 additions & 16 deletions CodeEdit/Features/Settings/Models/AppSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,24 @@ struct AppSettings<T>: DynamicProperty where T: Equatable {

let keyPath: WritableKeyPath<SettingsData, T>

@available(*,
deprecated,
message: """
Use init(_ keyPath:) instead, otherwise the view will be reevaluated on every settings change.
"""
)
init() where T == SettingsData {
self.keyPath = \.self
self.settings = .init(\.settings)
}

init(_ keyPath: WritableKeyPath<SettingsData, T>) {
self.keyPath = keyPath
let newKeyPath = (\EnvironmentValues.settings).appending(path: keyPath)
self.settings = .init(newKeyPath)
let settingsKeyPath = (\EnvironmentValues.settings).appending(path: keyPath)
self.settings = Environment(settingsKeyPath)
}

var wrappedValue: T {
get {
settings.wrappedValue
Settings.shared.preferences[keyPath: keyPath]
}
nonmutating set {
Settings.shared.preferences[keyPath: keyPath] = newValue
}
}

var projectedValue: Binding<T> {
.init {
settings.wrappedValue
Binding {
Settings.shared.preferences[keyPath: keyPath]
} set: {
Settings.shared.preferences[keyPath: keyPath] = $0
}
Expand Down
8 changes: 4 additions & 4 deletions CodeEdit/Features/WindowCommands/ViewCommands.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ struct ViewCommands: Commands {

Menu("Font Size") {
Button("Increase") {
if !(editorFontSize >= 288) {
if editorFontSize < 288 {
editorFontSize += 1
}
if !(terminalFontSize >= 288) {
if terminalFontSize < 288 {
terminalFontSize += 1
}
}
.keyboardShortcut("+")

Button("Decrease") {
if !(editorFontSize <= 1) {
if editorFontSize > 1 {
editorFontSize -= 1
}
if !(terminalFontSize <= 1) {
if terminalFontSize > 1 {
terminalFontSize -= 1
}
}
Expand Down