Browse Source

偏好设置-markup注释颜色补充交互

tangchao 2 years ago
parent
commit
b3cf295264

BIN
PDF Office/PDF Office.xcodeproj/project.xcworkspace/xcuserdata/kdanmobile.xcuserdatad/UserInterfaceState.xcuserstate


+ 16 - 0
PDF Office/PDF Office.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -388,5 +388,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "252C4250-F2DF-49DA-A152-70DC7487BCB5"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Office/Class/Preference/Controller/KMPreferenceMarkupController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "156"
+            endingLineNumber = "156"
+            landmarkName = "initData()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 2 - 0
PDF Office/PDF Office/Class/Preference/Controller/KMPreferenceMarkupController.swift

@@ -156,6 +156,7 @@ class KMPreferenceMarkupController: NSViewController {
                 if (red == 0 && green == 0 && blue == 0 && alpha == 0) {
                     itemView.button.image = NSImage(named: "KMImageNamePreferenceClearColor")
                 } else {
+                    itemView.button.image = nil
                     itemView.button.layer?.backgroundColor = color!.cgColor
                 }
             }
@@ -196,6 +197,7 @@ class KMPreferenceMarkupController: NSViewController {
         }
         
         let itemView = self.currentColorItemView!
+        itemView.button.image = nil
         itemView.button.layer?.backgroundColor = sender.color.cgColor
         
         if (itemView.key == KMMarkupColorHighlightKey) {

+ 2 - 2
PDF Office/PDF Office/Class/Preference/Tools/KMPreferenceManager.swift

@@ -801,10 +801,10 @@ extension KMPreferenceManager {
     }
     var markupLineColor: NSColor {
         get {
-            return self.getMarkData(forKey: CAnnotationSelfSignLineColorKey)
+            return self.getMarkData(forKey: CLineNoteColorKey)
         }
         set {
-            let _ = self.setMarkData(color:newValue, forKey: CAnnotationSelfSignLineColorKey)
+            let _ = self.setMarkData(color:newValue, forKey: CLineNoteColorKey)
         }
     }