Added preferences to show editor on startup

lukakerr · Sep 30, 2019 · 5170b42 · 5170b42
1 parent 7822b80
commit 5170b42
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 [Unreleased]
 ### New Features
+- Added preference to show editor on startup
 
 ### Fixes
 

diff --git a/Pine/Controllers/MarkdownViewController.swift b/Pine/Controllers/MarkdownViewController.swift
@@ -40,6 +40,16 @@ class MarkdownViewController: NSViewController, NSTextViewDelegate, HighlightDel
     return parent as? NSSplitViewController
   }
 
+  /// The split view controllers editor item
+  private var editorSplitViewItem: NSSplitViewItem? {
+    return splitViewController?.splitViewItems.first
+  }
+
+  /// The split view controllers preview item
+  private var previewSplitViewItem: NSSplitViewItem? {
+    return splitViewController?.splitViewItems.last
+  }
+
   /// The preview view controller for this markdown view controller
   private var previewViewController: PreviewViewController? {
     return splitViewController?.splitViewItems.last?.viewController as? PreviewViewController
@@ -74,10 +84,6 @@ class MarkdownViewController: NSViewController, NSTextViewDelegate, HighlightDel
       self.generatePreview()
     }
 
-    if let preview = splitViewController?.splitViewItems.last {
-      preview.isCollapsed = !preferences[.showPreviewOnStartup]
-    }
-
     self.setupTextStorage()
     self.setupScrollView()
     self.setupLayoutManager()
@@ -92,6 +98,11 @@ class MarkdownViewController: NSViewController, NSTextViewDelegate, HighlightDel
     view.addSubview(scrollView)
   }
 
+  override func viewWillAppear() {
+    previewSplitViewItem?.isCollapsed = !preferences[.showPreviewOnStartup]
+    editorSplitViewItem?.isCollapsed = !preferences[.showEditorOnStartup]
+  }
+
   // MARK: - Private functions for updating and setting view components
 
   private func setupTextStorage() {

diff --git a/Pine/Models/Preferences/Preferences.swift b/Pine/Models/Preferences/Preferences.swift
@@ -10,12 +10,13 @@ import Cocoa
 import cmark_gfm_swift
 
 extension PreferenceKeys {
-  static let showPreviewOnStartup = PreferenceKey<Bool>("showPreviewOnStartup", defaultValue: true)
   static let autosaveDocument = PreferenceKey<Bool>("autosaveDocument", defaultValue: true)
   static let verticalSplitView = PreferenceKey<Bool>("verticalSplitView", defaultValue: true)
   static let modernTitlebar = PreferenceKey<Bool>("modernTitlebar", defaultValue: true)
   static let useSystemAppearance = PreferenceKey<Bool>("useSystemAppearance", defaultValue: false)
   static let showSidebar = PreferenceKey<Bool>("showSidebar", defaultValue: true)
+  static let showEditorOnStartup = PreferenceKey<Bool>("showEditorOnStartup", defaultValue: true)
+  static let showPreviewOnStartup = PreferenceKey<Bool>("showPreviewOnStartup", defaultValue: true)
   static let spellcheckEnabled = PreferenceKey<Bool>("spellcheckEnabled", defaultValue: false)
   static let autoPairSyntax = PreferenceKey<Bool>("autoPairSyntax", defaultValue: true)
   static let useThemeColorForSidebar = PreferenceKey<Bool>("useThemeColorForSidebar", defaultValue: true)

diff --git a/Pine/Views/Preferences/GeneralStackView.swift b/Pine/Views/Preferences/GeneralStackView.swift
@@ -11,6 +11,7 @@ import Cocoa
 class GeneralStackView: NSStackView, PreferenceStackView {
 
   private let behaviorMap: BoolPreferenceMap = [
+    "Show editor on startup": .showEditorOnStartup,
     "Show preview on startup": .showPreviewOnStartup,
     "Open new document on startup": .openNewDocumentOnStartup,
     "Terminate after last window closed": .terminateAfterLastWindowClosed