Commit dd8fce2

authored

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

* add terminal zoom in/out (building on top of #1191) * respond to @austincondiff's review * make variables private * fix logic * fix @matthijseikelenboom's review comments

1 parent c7e8814 commit dd8fce2Copy full SHA for dd8fce2

File tree

2 files changed

+19

-6

lines changed

CodeEdit/Features
- TerminalEmulator
  - TerminalEmulatorView.swift
- WindowCommands
  - ViewCommands.swift

2 files changed

+19

-6

lines changed

`‎CodeEdit/Features/TerminalEmulator/TerminalEmulatorView.swift‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ struct TerminalEmulatorView: NSViewRepresentable {`
`31`	`31`
`32`	`32`	`private var font: NSFont {`
`33`	`33`	`if !prefs.preferences.terminal.font.customFont {`
`34`		`- return systemFont`
	`34`	`+ return systemFont.withSize(CGFloat(prefs.preferences.terminal.font.size))`
`35`	`35`	`}`
`36`	`36`	`return NSFont(`
`37`	`37`	`name: prefs.preferences.terminal.font.name,`

`‎CodeEdit/Features/WindowCommands/ViewCommands.swift‎`

Lines changed: 18 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,14 @@`
`8`	`8`	`import SwiftUI`
`9`	`9`
`10`	`10`	`struct ViewCommands: Commands {`
	`11`	`+ @ObservedObject`
`11`	`12`	`private var prefs: AppPreferencesModel = .shared`
	`13`	`+`
`12`	`14`	`@State var windowController: CodeEditWindowController?`
`13`	`15`
	`16`	`+ private let documentController: CodeEditDocumentController = CodeEditDocumentController()`
	`17`	`+ private let statusBarViewModel: StatusBarViewModel = StatusBarViewModel()`
	`18`	`+`
`14`	`19`	`var navigatorCollapsed: Bool {`
`15`	`20`	`windowController?.navigatorCollapsed ?? false`
`16`	`21`	`}`
`@@ -26,14 +31,22 @@ struct ViewCommands: Commands {`
`26`	`31`	`}`
`27`	`32`	`.keyboardShortcut("p", modifiers: [.shift, .command])`
`28`	`33`
`29`		`- Button("Zoom in") {`
`30`		`- prefs.preferences.textEditing.font.size += 1`
	`34`	`+ Button("Increase font size") {`
	`35`	`+ if CodeEditDocumentController.shared.documents.count > 1 {`
	`36`	`+ prefs.preferences.textEditing.font.size += 1`
	`37`	`+ }`
	`38`	`+ prefs.preferences.terminal.font.size += 1`
`31`	`39`	`}`
`32`	`40`	`.keyboardShortcut("+")`
`33`	`41`
`34`		`- Button("Zoom out") {`
`35`		`- if !(prefs.preferences.textEditing.font.size <= 1) {`
`36`		`- prefs.preferences.textEditing.font.size -= 1`
	`42`	`+ Button("Decrease font size") {`
	`43`	`+ if CodeEditDocumentController.shared.documents.count > 1 {`
	`44`	`+ if !(prefs.preferences.textEditing.font.size <= 1) {`
	`45`	`+ prefs.preferences.textEditing.font.size -= 1`
	`46`	`+ }`
	`47`	`+ }`
	`48`	`+ if !(prefs.preferences.terminal.font.size <= 1) {`
	`49`	`+ prefs.preferences.terminal.font.size -= 1`
`37`	`50`	`}`
`38`	`51`	`}`
`39`	`52`	`.keyboardShortcut("-")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit dd8fce2

File tree

2 files changed

2 files changed

`‎CodeEdit/Features/TerminalEmulator/TerminalEmulatorView.swift‎`

`‎CodeEdit/Features/WindowCommands/ViewCommands.swift‎`

0 commit comments