Skip to content

Add terminal zoom in/out (building on top of #1191) #1209

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 5 commits into from
Mar 29, 2023
Merged

Add terminal zoom in/out (building on top of #1191) #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5261df0
add terminal zoom in/out (building on top of #1191)
luah5 Mar 28, 2023
53a2ad1
respond to @austincondiff's review
luah5 Mar 29, 2023
365bf9b
make variables private
luah5 Mar 29, 2023
7ff1e0e
fix logic
luah5 Mar 29, 2023
c423490
fix @matthijseikelenboom's review comments
luah5 Mar 29, 2023
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
2 changes: 1 addition & 1 deletion CodeEdit/Features/TerminalEmulator/TerminalEmulatorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct TerminalEmulatorView: NSViewRepresentable {

private var font: NSFont {
if !prefs.preferences.terminal.font.customFont {
return systemFont
return systemFont.withSize(CGFloat(prefs.preferences.terminal.font.size))
}
return NSFont(
name: prefs.preferences.terminal.font.name,
Expand Down
23 changes: 18 additions & 5 deletions CodeEdit/Features/WindowCommands/ViewCommands.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
import SwiftUI

struct ViewCommands: Commands {
@ObservedObject
private var prefs: AppPreferencesModel = .shared

@State var windowController: CodeEditWindowController?

private let documentController: CodeEditDocumentController = CodeEditDocumentController()
private let statusBarViewModel: StatusBarViewModel = StatusBarViewModel()

var navigatorCollapsed: Bool {
windowController?.navigatorCollapsed ?? false
}
Expand All @@ -26,14 +31,22 @@ struct ViewCommands: Commands {
}
.keyboardShortcut("p", modifiers: [.shift, .command])

Button("Zoom in") {
prefs.preferences.textEditing.font.size += 1
Button("Increase font size") {
if CodeEditDocumentController.shared.documents.count > 1 {
prefs.preferences.textEditing.font.size += 1
}
prefs.preferences.terminal.font.size += 1
}
.keyboardShortcut("+")

Button("Zoom out") {
if !(prefs.preferences.textEditing.font.size <= 1) {
prefs.preferences.textEditing.font.size -= 1
Button("Decrease font size") {
if CodeEditDocumentController.shared.documents.count > 1 {
if !(prefs.preferences.textEditing.font.size <= 1) {
prefs.preferences.textEditing.font.size -= 1
}
}
if !(prefs.preferences.terminal.font.size <= 1) {
prefs.preferences.terminal.font.size -= 1
}
}
.keyboardShortcut("-")
Expand Down