Use preferred font on app start and text resize

This commit is contained in:
Matt Baer 2017-07-31 19:25:58 -04:00
parent 5adfab9b07
commit 81964d9ffa
2 changed files with 2 additions and 5 deletions

View File

@ -29,13 +29,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
let font = Preferences.getFont() let font = Preferences.getFont()
if font == Preferences.PostFont.serif { if font == Preferences.PostFont.serif {
formatFontSerifItem.state = NSOnState formatFontSerifItem.state = NSOnState
vc?.setFont(.serif)
} else if font == Preferences.PostFont.sans { } else if font == Preferences.PostFont.sans {
formatFontSansItem.state = NSOnState formatFontSansItem.state = NSOnState
vc?.setFont(.sans)
} else if font == Preferences.PostFont.mono { } else if font == Preferences.PostFont.mono {
formatFontMonoItem.state = NSOnState formatFontMonoItem.state = NSOnState
vc?.setFont(.mono)
} }
} }

View File

@ -19,7 +19,7 @@ class ViewController: NSViewController, NSTextViewDelegate, NSUserNotificationCe
loadDocument() loadDocument()
writerText.font = NSFont(name: "Lora", size: Preferences.getFontSize()) writerText.font = NSFont(name: Preferences.getFont().typeface, size: Preferences.getFontSize())
writerText.isHorizontallyResizable = false writerText.isHorizontallyResizable = false
writerText.textContainerInset = NSSize(width: 16, height: 16) writerText.textContainerInset = NSSize(width: 16, height: 16)
writerText.isAutomaticQuoteSubstitutionEnabled = false writerText.isAutomaticQuoteSubstitutionEnabled = false
@ -139,7 +139,7 @@ class ViewController: NSViewController, NSTextViewDelegate, NSUserNotificationCe
} else { } else {
size -= 1 size -= 1
} }
self.writerText.font = NSFont(name: "Lora", size: size) self.writerText.font = NSFont(name: Preferences.getFont().typeface, size: size)
UserDefaults.standard.set(String(Int(size)), forKey: "editor_text_size") UserDefaults.standard.set(String(Int(size)), forKey: "editor_text_size")
configureWindow() configureWindow()
} }