qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-26 07:13:24 +03:00
Code Issues Projects Releases Wiki Activity

Store preferences correctly

Browse Source
This commit is contained in:
Tae Won Ha 2017-01-01 17:14:54 +09:00
parent 6b0e147b64
commit 4db07f2672
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VimR/MainWindowComponent.swift
View File

@ -70,11 +70,11 @@ struct MainWindowPrefData: StandardPrefData {
} }
func toolPrefData(for identifier: ToolIdentifier) -> ToolPrefData { func toolPrefData(for identifier: ToolIdentifier) -> ToolPrefData {
guard let tool = self.toolPrefDatas.filter({ $0.identifier == identifier }).first else { guard let data = self.toolPrefDatas.filter({ $0.identifier == identifier }).first else {
preconditionFailure("[ERROR] No tool for \(identifier) found!") preconditionFailure("[ERROR] No tool for \(identifier) found!")
} }
return tool return data
} }
} }

9
VimR/PrefWindowComponent.swift
View File

@ -51,14 +51,7 @@ class PrefWindowComponent: WindowComponent, NSWindowDelegate, NSTableViewDataSou
return source return source
.filter { $0 is PrefData } .filter { $0 is PrefData }
.map { $0 as! PrefData } .map { $0 as! PrefData }
.subscribe(onNext: { [unowned self] prefData in .subscribe(onNext: { [unowned self] prefData in self.data = prefData })
if prefData.appearance.editorFont == self.data.appearance.editorFont
&& prefData.appearance.editorUsesLigatures == self.data.appearance.editorUsesLigatures {
return
}
self.data = prefData
})
} }
override func addViews() { override func addViews() {

2
VimR/ToolPrefData.swift
View File

@ -34,7 +34,7 @@ struct ToolPrefData: StandardPrefData {
toolData: FileBrowserData.default), toolData: FileBrowserData.default),
.bufferList: ToolPrefData(identifier: .bufferList, .bufferList: ToolPrefData(identifier: .bufferList,
location: .left, location: .left,
isVisible: true, isVisible: false,
dimension: 200, dimension: 200,
toolData: EmptyPrefData.default), toolData: EmptyPrefData.default),
] ]