qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-29 16:56:40 +03:00
Code Issues Projects Releases Wiki Activity

Refactor slightly

Browse Source
This commit is contained in:
Tae Won Ha 2018-07-15 21:19:17 +02:00
parent a7055dacba
commit c72faf1c36
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
VimR/VimR/States.swift
View File

@ -227,6 +227,20 @@ extension MainWindow {
static let `default` = State(isAllToolsVisible: true, isToolButtonsVisible: true) static let `default` = State(isAllToolsVisible: true, isToolButtonsVisible: true)
static let defaultTools = [
MainWindow.Tools.fileBrowser: WorkspaceToolState(location: .left, dimension: 200, open: true),
MainWindow.Tools.buffersList: WorkspaceToolState(location: .left, dimension: 200, open: false),
MainWindow.Tools.preview: WorkspaceToolState(location: .right, dimension: 250, open: false),
MainWindow.Tools.htmlPreview: WorkspaceToolState(location: .right, dimension: 500, open: false),
]
static let orderedDefault = [
MainWindow.Tools.fileBrowser,
MainWindow.Tools.buffersList,
MainWindow.Tools.preview,
MainWindow.Tools.htmlPreview,
]
var isAllToolsVisible = true var isAllToolsVisible = true
var isToolButtonsVisible = true var isToolButtonsVisible = true
var activeTools = [ var activeTools = [
@ -242,8 +256,8 @@ extension MainWindow {
var goToLineFromCli: Marked<Int>? var goToLineFromCli: Marked<Int>?
var lastFileSystemUpdate = Marked(FileUtils.userHomeUrl) var lastFileSystemUpdate = Marked(FileUtils.userHomeUrl)
var tools = WorkspaceToolState.defaultTools var tools = MainWindow.State.defaultTools
var orderedTools = WorkspaceToolState.orderedDefault var orderedTools = MainWindow.State.orderedDefault
var preview = PreviewState.default var preview = PreviewState.default
var htmlPreview = HtmlPreviewState.default var htmlPreview = HtmlPreviewState.default
@ -353,7 +367,7 @@ extension MainWindow {
} }
let missingTools = MainWindow.Tools.all.subtracting(self.tools.keys) let missingTools = MainWindow.Tools.all.subtracting(self.tools.keys)
missingTools.forEach { missingTool in missingTools.forEach { missingTool in
self.tools[missingTool] = WorkspaceToolState.defaultTools[missingTool]! self.tools[missingTool] = MainWindow.State.defaultTools[missingTool]!
} }
self.previewTool = try container.decode(forKey: .previewTool, default: State.default.previewTool) self.previewTool = try container.decode(forKey: .previewTool, default: State.default.previewTool)
@ -391,20 +405,6 @@ struct WorkspaceToolState: Codable {
static let `default` = WorkspaceToolState() static let `default` = WorkspaceToolState()
static let defaultTools = [
MainWindow.Tools.fileBrowser: WorkspaceToolState(location: .left, dimension: 200, open: true),
MainWindow.Tools.buffersList: WorkspaceToolState(location: .left, dimension: 200, open: false),
MainWindow.Tools.preview: WorkspaceToolState(location: .right, dimension: 250, open: false),
MainWindow.Tools.htmlPreview: WorkspaceToolState(location: .right, dimension: 500, open: false),
]
static let orderedDefault = [
MainWindow.Tools.fileBrowser,
MainWindow.Tools.buffersList,
MainWindow.Tools.preview,
MainWindow.Tools.htmlPreview,
]
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case location = "location" case location = "location"