qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-28 19:47:41 +03:00
Code Issues Projects Releases Wiki Activity

GH-244 Refactor PrefStore

Browse Source
This commit is contained in:
Tae Won Ha 2016-08-13 23:01:31 +02:00
parent a95ee0ddf8
commit d30b2ab31b
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
VimR/PrefStore.swift
View File

@ -11,6 +11,9 @@ private class PrefKeys {
static let editorFontName = "editor-font-name"
static let editorFontSize = "editor-font-size"
static let editorUsesLigatures = "editor-uses-ligatures"
static let openNewWindowWhenLaunching = "open-new-window-when-launching"
static let openNewWindowOnReactivation = "open-new-window-on-reactivation"
}
class PrefStore: Store {
@ -51,29 +54,31 @@ class PrefStore: Store {
}
private func prefDataFromDict(prefs: [String: AnyObject]) -> PrefData {
let defaultFontSize = NSNumber(float: Float(PrefStore.defaultEditorFont.pointSize))
let editorFontName = prefs[PrefKeys.editorFontName] as? String ?? PrefStore.defaultEditorFont.fontName
let editorFontSizeFromPref = prefs[PrefKeys.editorFontSize] as? NSNumber ?? defaultFontSize
let editorFontSize: CGFloat = CGFloat(editorFontSizeFromPref.floatValue) ?? CGFloat(defaultFontSize)
let editorFontSize = CGFloat(
(prefs[PrefKeys.editorFontSize] as? NSNumber)?.floatValue ?? Float(PrefStore.defaultEditorFont.pointSize)
)
let editorFont = self.saneFont(editorFontName, fontSize: editorFontSize)
let usesLigatures = (prefs[PrefKeys.editorUsesLigatures] as? NSNumber)?.boolValue ?? false
let openNewWindowWhenLaunching = (prefs[PrefKeys.openNewWindowWhenLaunching] as? NSNumber)?.boolValue ?? true
let openNewWindowOnReactivation = (prefs[PrefKeys.openNewWindowOnReactivation] as? NSNumber)?.boolValue ?? true
var editorFont = NSFont(name: editorFontName, size: editorFontSize) ?? PrefStore.defaultEditorFont
return PrefData(appearance: AppearancePrefData(editorFont: editorFont, editorUsesLigatures: usesLigatures))
}
private func saneFont(fontName: String, fontSize: CGFloat) -> NSFont {
var editorFont = NSFont(name: fontName, size: fontSize) ?? PrefStore.defaultEditorFont
if !editorFont.fixedPitch {
editorFont = fontManager.convertFont(PrefStore.defaultEditorFont, toSize: editorFont.pointSize)
}
if editorFont.pointSize < PrefStore.minimumEditorFontSize
|| editorFont.pointSize > PrefStore.maximumEditorFontSize {
editorFont = fontManager.convertFont(editorFont, toSize: CGFloat(defaultFontSize))
}
let usesLigatures: Bool
if let usesLigaturesFromPref = prefs[PrefKeys.editorUsesLigatures] as? NSNumber {
usesLigatures = usesLigaturesFromPref.boolValue
} else {
usesLigatures = false
editorFont = fontManager.convertFont(editorFont, toSize: PrefStore.defaultEditorFont.pointSize)
}
return PrefData(appearance: AppearancePrefData(editorFont: editorFont, editorUsesLigatures: usesLigatures))
return editorFont
}
private func prefsDict(prefData: PrefData) -> [String: AnyObject] {