【综合】新手引导 UI问题(已修复)

PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMCustomColorGuideView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -40,7 +40,7 @@
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="WB5-SO-mvF">
                             <rect key="frame" x="166" y="68" width="300" height="126"/>
                             <subviews>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tvJ-xF-71m">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tvJ-xF-71m">
                                     <rect key="frame" x="18" y="89" width="96" height="17"/>
                                     <textFieldCell key="cell" alignment="left" title="PDF to Office" id="CH9-8z-XVt">
                                         <font key="font" metaFont="systemBold" size="14"/>
@@ -48,7 +48,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rWm-ru-kMX">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rWm-ru-kMX">
                                     <rect key="frame" x="18" y="64" width="264" height="17"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="260" id="Bw4-qg-ejW"/>
@@ -59,13 +59,13 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <box boxType="custom" borderType="line" cornerRadius="2" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="WX1-bZ-Pfr" customClass="KMBox">
+                                <box boxType="custom" borderType="line" cornerRadius="2" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="WX1-bZ-Pfr" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="226" y="20" width="54" height="24"/>
                                     <view key="contentView" id="3pq-7c-eUt">
                                         <rect key="frame" x="1" y="1" width="52" height="22"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WQ7-ua-ZcP">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WQ7-ua-ZcP">
                                                 <rect key="frame" x="7" y="3" width="39" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Next" id="QAH-51-4An">
                                                     <font key="font" metaFont="systemBold"/>
@@ -73,7 +73,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rx1-Rj-nA5" customClass="KMButton">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rx1-Rj-nA5" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="52" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="PMy-In-n4q">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMPropertiesViewPopController.swift

@@ -22,31 +22,31 @@ import Cocoa
     static let defaultManager = KMPropertiesViewPopController()
 
     class func showChangeColorDetails() -> Bool {
-        let isOpenConvertDetails = UserDefaults.standard.bool(forKey: "KMPropertiesHaveChangeColorDetails")
-        if !isOpenConvertDetails {
+//        let isOpenConvertDetails = UserDefaults.standard.bool(forKey: "KMPropertiesHaveChangeColorDetails")
+//        if !isOpenConvertDetails {
             return true
-        }
-        return false
+//        }
+//        return false
     }
 
     func showChangeColorDetailsView(_ view: NSView) {
-        let popViewController = KMPropertiesViewPopController()
-        popViewController.block = { [weak self] in
-            self?.popOver?.close()
-        }
-        self.popOver = NSPopover()
-        self.popOver?.contentViewController = popViewController
-        self.popOver?.animates = false
-        self.popOver?.behavior = .transient
-//        self.popOver?.appearance = .minimal
-        self.popOver?.contentSize = popViewController.view.frame.size
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            if view.superview?.window == nil {
-                return
+            if KMGuideInfoWindowController.availableShow(.customColor) {
+                let guideWC = KMGuideInfoWindowController.currentWC()
+                guideWC.type = .customColor
+                guideWC.digitalBoxRect = view.superview?.convert(view.frame, to: view.window?.contentView) ?? .zero
+                var beh = view.window?.collectionBehavior ?? []
+                beh.insert(.canJoinAllSpaces)
+                guideWC.window?.collectionBehavior = beh
+                
+                var rect = view.window?.frame ?? .zero
+                rect.size.height -= 20
+                guideWC.window?.setFrame(rect, display: false)
+                guideWC.window?.minSize = rect.size
+                guideWC.window?.maxSize = rect.size
+                view.window?.addChildWindow(guideWC.window!, ordered: .above)
+                guideWC.show()
             }
-            UserDefaults.standard.set(true, forKey: "KMPropertiesHaveChangeColorDetails")
-            UserDefaults.standard.synchronize()
-            self.popOver?.show(relativeTo: view.bounds, of: view, preferredEdge: .maxY)
         }
     }
 

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -276,5 +276,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "2D1B4940-894F-483C-B9C2-5FC4866782F7"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3500"
+            endingLineNumber = "3500"
+            landmarkName = "changeModelAction(mode:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>