【2025】【View】View模块自测处理

PDF Office/KMComponentLibrary/KMComponentLibrary/View/GroupItem/ComponentGroupWindowController.xib

@@ -13,8 +13,8 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="F0z-JX-Cv5" customClass="ComponentGroupWindow" customModule="KMComponentLibrary" customModuleProvider="target">
-            <windowStyleMask key="styleMask" titled="YES" fullSizeContentView="YES"/>
+        <window title="Window" separatorStyle="none" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="F0z-JX-Cv5" customClass="ComponentGroupWindow" customModule="KMComponentLibrary" customModuleProvider="target">
+            <windowStyleMask key="styleMask" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="480" height="270"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
@@ -25,7 +25,7 @@
             <connections>
                 <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
             </connections>
-            <point key="canvasLocation" x="188" y="182"/>
+            <point key="canvasLocation" x="39" y="177"/>
         </window>
     </objects>
 </document>

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -1186,6 +1186,7 @@ struct KMNMWCFlags {
         if let backgroundColor = UserDefaults.standard.color(forKey: KMBackgroundColorKey) {
             listView.backgroundColor = backgroundColor
         }
+        reloadPDFSplitInfo()
     }
     
     func applyPDFSettings(_ setup: NSDictionary) {
@@ -7481,6 +7482,10 @@ extension KMMainViewController {
             textFieldSheet.close()
         }
         
+        if NSColorPanel.shared.isVisible == true {
+            NSColorPanel.shared.close()
+        }
+        
     }
     
     public func clearSecureOptions() {

PDF Office/PDF Master/KMClass/KMPDFViewController/KMNDisplayViewController/KMNDisplayViewController.swift

@@ -74,8 +74,10 @@ class KMNDisplayViewController: NSViewController {
     @IBOutlet var boxHeightConst: NSLayoutConstraint!
     
     private var themesArray: [NSColor] = []
-     private var themeEditItem: ComponentCColorItem?
+    private var themeEditItem: ComponentCColorItem?
     
+    var isCustomSelected = false //防止多个相同的自定义颜色item，出现同时选中的情况，
+        
     var pdfView: CPDFListView?
     var viewManager: KMPDFViewManager?
     
@@ -395,26 +397,19 @@ class KMNDisplayViewController: NSViewController {
                 colorItem.properties?.identifier = "custom"
             }
             
-            if pdfView?.displayMode == .normal {
-                if index == 0 {
-                    colorItem.properties?.state = .pressed
-                }
-            } else if pdfView?.displayMode == .soft {
-                if index == 1 {
-                    colorItem.properties?.state = .pressed
-                }
-            } else if pdfView?.displayMode == .night {
-                if index == 3 {
-                    colorItem.properties?.state = .pressed
-                }
-            } else if pdfView?.displayMode == .green {
-                if index == 2 {
-                    colorItem.properties?.state = .pressed
-                }
-            } else if pdfView?.displayMode == .custom {
-                if color == pdfView?.displayModeCustomColor {
-                    colorItem.properties?.state = .pressed
-                }
+            if pdfView?.displayMode == .normal && index == 0 {
+                colorItem.properties?.state = .pressed
+            } else if pdfView?.displayMode == .soft && index == 1 {
+                colorItem.properties?.state = .pressed
+            } else if pdfView?.displayMode == .night && index == 3 {
+                colorItem.properties?.state = .pressed
+            } else if pdfView?.displayMode == .green && index == 2 {
+                colorItem.properties?.state = .pressed
+            } else if pdfView?.displayMode == .custom && color == pdfView?.displayModeCustomColor && isCustomSelected == false {
+                colorItem.properties?.state = .pressed
+                isCustomSelected = true
+            } else {
+                colorItem.properties?.state = .normal
             }
             colorItem.reloadData()
             themesContendView.addSubview(colorItem)
@@ -438,13 +433,22 @@ class KMNDisplayViewController: NSViewController {
     func refreshColorItems() {
         let subviews = themesContendView.subviews
         for view in subviews {
-            if view is ComponentCColorItem {
-                if (view as! ComponentCColorItem).properties?.color == pdfView?.displayModeCustomColor {
-                    (view as! ComponentCColorItem).properties?.state = .pressed
+            if let item = view as? ComponentCColorItem {
+                if item.properties?.identifier == "normal" && pdfView?.displayMode == .normal {
+                    item.properties?.state = .pressed
+                } else if item.properties?.identifier == "soft" && pdfView?.displayMode == .soft {
+                    item.properties?.state = .pressed
+                } else if item.properties?.identifier == "night" && pdfView?.displayMode == .night {
+                    item.properties?.state = .pressed
+                } else if item.properties?.identifier == "green" && pdfView?.displayMode == .green {
+                    item.properties?.state = .pressed
+                } else if pdfView?.displayMode == .custom && item.properties?.color == pdfView?.displayModeCustomColor && isCustomSelected == false {
+                    item.properties?.state = .pressed
+                    isCustomSelected = true
                 } else {
-                    (view as! ComponentCColorItem).properties?.state = .normal
-                }
-                (view as! ComponentCColorItem).reloadData()
+                    item.properties?.state = .normal
+                } 
+                item.reloadData()
             }
         }
         
@@ -661,7 +665,7 @@ class KMNDisplayViewController: NSViewController {
     }
     
     //MARK: - Mouse
-     
+    
 }
 
 //MARK: - ComponentCColorDelegate
@@ -708,13 +712,13 @@ extension KMNDisplayViewController: ComponentCColorDelegate {
             }
         }
     }
-     
+    
     func componentCColorDidRightMouseUpWithStrings(_ view: NSView) -> [String] {
         let subviews = themesContendView.subviews
         let index = subviews.firstIndex(of: view) ?? 0
         
         if index <= 3 {
-             
+            
         } else {
             if view is ComponentCColorItem {
                 if (view as! ComponentCColorItem) != themeEditItem {
@@ -733,9 +737,10 @@ extension KMNDisplayViewController: ComponentCColorDelegate {
             }
         }
         
-        setUpThemesItems()
+        self.pdfView?.setPageBackgroundColorWith(NSColor.white, viewMode: .normal)
         
-        saveThemeColors()
+        self.setUpThemesItems()
         
+        self.saveThemeColors()
     }
 }