偏好设置-阅读页背景色新增交互

PDF Office/PDF Office/Class/Common/Tools/KMTools.swift

@@ -138,6 +138,13 @@ import Cocoa
     class func UTIforFileExtension(_ exn: String) -> String {
         return (UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, exn as CFString, nil)?.takeUnretainedValue())! as String
     }
+    
+    // MARK: -
+    // MARK: 是否全屏
+    
+    class func isFullScreen(_ window: NSWindow) -> Bool {
+        return window.styleMask.contains(.fullScreen)
+    }
 }
 
 // MARK: -

PDF Office/PDF Office/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -136,6 +136,16 @@ import Cocoa
 //        KMPreferenceManager.shared.setPageNumber(self.listView.currentPageIndex, forKey: self.listView.document.documentURL.path)
     }
     
+    override func viewWillLayout() {
+        super.viewWillLayout()
+        
+        if (KMTools.isFullScreen(self.view.window!)) { // 全屏
+            self.listView.backgroundColor = KMPreferenceManager.shared.displayBackgroundFullScreenColor
+        } else {
+            self.listView.backgroundColor = KMPreferenceManager.shared.displayBackgroundNormalColor
+        }
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -709,7 +719,7 @@ import Cocoa
         self.currentPageLabel.isSelectable = false
         self.updatePageIndicatoreType()
         
-        self.tipCurrentPageBox.downCallback =  {(mouseEntered: Bool, mouseBox: KMBox) -> Void in
+        self.tipCurrentPageBox.downCallback =  { [unowned self] (mouseEntered: Bool, mouseBox: KMBox) -> Void in
             self.currentPageLabel.backgroundColor = NSColor.white
             self.currentPageLabel.textColor = NSColor.black
             if self.currentPageWidthConstraint.constant < 40 {

PDF Office/PDF Office/Class/Preference/Tools/KMPreferenceManager.swift

@@ -336,77 +336,77 @@ class KMPreferenceManager: NSObject {
 //}
 // MARK: 扩展 颜色
 extension KMPreferenceManager {
-    var displayBackgroundNormalColorValues: [Double] {
+    fileprivate var displayBackgroundNormalColorValues: [Double] {
         get {
             return [206/255.0, 208/255.0, 212/255.0, 1.0]
         }
     }
-    var displayBackgroundFullScreenColorValues: [Double] {
+    fileprivate var displayBackgroundFullScreenColorValues: [Double] {
         get {
             return [54/255.0, 56/255.0, 59/255.0, 1.0]
         }
     }
-    var displayFieldHighlightingColorValues: [Double] {
+    fileprivate var displayFieldHighlightingColorValues: [Double] {
         get {
             return [189/255.0, 223/255.0, 253/255.0, 1.0]
         }
     }
-    var displayRequiredFieldHighlightingColorValues: [Double] {
+    fileprivate var displayRequiredFieldHighlightingColorValues: [Double] {
         get {
             return [23/255.0, 112/255.0, 224/255.0, 1.0]
         }
     }
-    var markupHighlightColorValues: [Double] {
+    fileprivate var markupHighlightColorValues: [Double] {
         get {
             return [255/255.0, 175/255.0, 37/255.0, 1.0]
         }
     }
-    var markupStrikthroughColorValues: [Double] {
+    fileprivate var markupStrikthroughColorValues: [Double] {
         get {
             return [243/255.0, 70/255.0, 91/255.0, 1.0]
         }
     }
-    var markupUnderlineColorValues: [Double] {
+    fileprivate var markupUnderlineColorValues: [Double] {
         get {
             self.markupStrikthroughColorValues
         }
     }
-    var markupPenColorValues: [Double] {
+    fileprivate var markupPenColorValues: [Double] {
         get {
             self.markupStrikthroughColorValues
         }
     }
-    var markupTextColorValues: [Double] {
+    fileprivate var markupTextColorValues: [Double] {
         get {
             return [0/255.0, 0/255.0, 0/255.0, 0.0]
         }
     }
-    var markupNoteColorValues: [Double] {
+    fileprivate var markupNoteColorValues: [Double] {
         get {
             return [255/255.0, 213/255.0, 115/255.0, 1.0]
         }
     }
-    var markupRectangleFillColorValues: [Double] {
+    fileprivate var markupRectangleFillColorValues: [Double] {
         get {
             return self.markupHighlightColorValues
         }
     }
-    var markupRectangleBorderColorValues: [Double] {
+    fileprivate var markupRectangleBorderColorValues: [Double] {
         get {
             self.markupStrikthroughColorValues
         }
     }
-    var markupCircleFillColorValues: [Double] {
+    fileprivate var markupCircleFillColorValues: [Double] {
         get {
             self.markupStrikthroughColorValues
         }
     }
-    var markupCircleBorderColorValues: [Double] {
+    fileprivate var markupCircleBorderColorValues: [Double] {
         get {
             return self.markupHighlightColorValues
         }
     }
-    var markupLineColorValues: [Double] {
+    fileprivate var markupLineColorValues: [Double] {
         get {
             self.markupStrikthroughColorValues
         }