【2025】【悬浮菜单】整理代码

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListAnnotationNoteWindowController.swift

@@ -1,193 +0,0 @@
-//
-//  CPDFListAnnotationNoteWindowController.swift
-//  PDF Reader Pro
-//
-//  Created by wanjun on 2023/10/10.
-//
-
-import Cocoa
-
-private var CNoteWindowNoteObservationContext = 0
-
-@objcMembers
-class CPDFListAnnotationNoteWindowController: KMBaseWindowController {
-    
-    private(set) var note: CPDFAnnotation?
-    
-    @IBOutlet weak var contentBox: NSBox!
-    @IBOutlet var contentTextView: NSTextView!
-    
-    @IBOutlet var titleLabel: NSTextField!
-    
-    @IBOutlet var sureButton: NSButton!
-    
-    @IBOutlet var cancelButton: NSButton!
-    
-//    var note: CPDFAnnotation?
-    
-    var cancelButtonVC: KMDesignButton?
-    var sureButtonVC: KMDesignButton?
-    
-    static let sharedInstance: CPDFListAnnotationNoteWindowController = {
-        let controller = CPDFListAnnotationNoteWindowController(windowNibName: NSNib.Name("CPDFListAnnotationNoteWindowController"))
-        return controller
-    }()
-    
-    override init(window: NSWindow?) {
-        super.init(window: window)
-    }
-    
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-    }
-    
-    func updateAnnotation(_ note: CPDFAnnotation) {
-        self.contentTextView.delegate = self
-        self.note = note
-        
-        if let markupNote = self.note as? CPDFMarkupAnnotation {
-//            var markupString = markupNote.markupText().replacingOccurrences(of: " ", with: "")
-//            let contentString = self.note!.contents.replacingOccurrences(of: " ", with: "")
-//
-//            if markupString == contentString {
-//                markupString = ""
-//            }
-            self.contentTextView.string = markupNote.markupText() ?? ""
-        } else {
-            self.contentTextView.string = self.note!.contents ?? ""
-        }
-        
-        if self.contentTextView.string.count > 0 {
-            self.contentTextView.placeholderLabel.isHidden = true
-        } else {
-            self.contentTextView.placeholderLabel.isHidden = false
-        }
-        
-        self.note!.addObserver(self, forKeyPath: "page", options: [], context: &CNoteWindowNoteObservationContext)
-        self.note!.addObserver(self, forKeyPath: "bounds", options: [], context: &CNoteWindowNoteObservationContext)
-        
-        if self.note is CPDFMarkupAnnotation {
-            self.note!.addObserver(self, forKeyPath: "markupText", options: [], context: &CNoteWindowNoteObservationContext)
-        } else {
-            self.note!.addObserver(self, forKeyPath: "contents", options: [], context: &CNoteWindowNoteObservationContext)
-        }
-    }
-    
-    override func windowDidLoad() {
-        super.windowDidLoad()
-    
-        // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
-        
-        self.window?.isMovableByWindowBackground = true
-//        self.window?.backgroundColor = NSColor.clear
-        self.window?.contentView?.wantsLayer = true
-//        self.window?.contentView?.layer?.backgroundColor = NSColor.white.cgColor
-        self.window?.contentView?.layer?.borderWidth = 1.0
-        self.window?.contentView?.layer?.borderColor = NSColor(white: 0, alpha: 0.1).cgColor
-        window?.contentView?.layer?.cornerRadius = 8.0
-        window?.contentView?.layer?.masksToBounds = true
-        
-        self.cancelButtonVC = KMDesignButton.init(withType: .Text)
-//        self.cancelButton.addSubview(self.cancelButtonVC!.view)
-        self.cancelButtonVC?.view.frame = self.cancelButton.bounds
-        self.cancelButtonVC?.view.autoresizingMask = [.width, .height]
-        self.cancelButtonVC?.stringValue = NSLocalizedString("Cancel", comment: "")
-        self.cancelButtonVC?.button(type: .Sec, size: .m, height: NSLayoutConstraint())
-        self.cancelButtonVC?.target = self
-        self.cancelButtonVC?.action = #selector(buttonItemClick_Cancel(_:))
-        self.cancelButton.title = NSLocalizedString("Cancel", comment: "")
-        self.cancelButton.action = #selector(buttonItemClick_Cancel(_:))
-        
-        self.sureButtonVC = KMDesignButton.init(withType: .Text)
-//        self.sureButton.addSubview(self.sureButtonVC!.view)
-        self.sureButtonVC?.view.frame = sureButton.bounds
-        self.sureButtonVC?.view.autoresizingMask = [.width, .height]
-        self.sureButtonVC?.stringValue = NSLocalizedString("OK", comment: "")
-        self.sureButtonVC?.button(type: .Cta, size: .m, height: NSLayoutConstraint())
-        self.sureButtonVC?.target = self
-        self.sureButtonVC?.action = #selector(buttonItemClick_Sure(_:))
-        self.sureButton.title = NSLocalizedString("OK", comment: "")
-        self.sureButton.action = #selector(buttonItemClick_Sure(_:))
-        
-        self.titleLabel.stringValue = NSLocalizedString("Add Note", comment: "")
-//        self.sureButton.title = NSLocalizedString("", comment: "")
-//        self.cancelButton.title = NSLocalizedString("", comment: "")
-//        self.titleLabel.textColor = NSColor(red: 37/255.0, green: 38/255.0, blue: 41/255.0, alpha: 1.0)
-        self.titleLabel.font = NSFont(name: "SFProText-Semibold", size: 16)
-        
-        self.contentBox.cornerRadius = 4
-        self.contentBox.borderWidth = 1
-//        self.contentBox.borderColor = NSColor(red: 223/255.0, green: 225/255.0, blue: 229/255.0, alpha: 1.0)
-        self.contentBox.fillColor = KMAppearance.Layout.bgColor()
-        
-        self.contentTextView.textContainerInset = NSSize(width: 2, height: 5)
-        self.contentTextView.textContainer?.lineBreakMode = .byWordWrapping
-        self.contentTextView.km_placeholderString = NSLocalizedString("Please add notes", comment: "")
-        self.contentTextView.allowsUndo = true;
-    }
-    
-    override func windowWillLoad() {
-        if let note = self.note {
-            note.removeObserver(self, forKeyPath: "bounds")
-            if let note = self.note as? CPDFMarkupAnnotation {
-                note.removeObserver(self, forKeyPath: "markupText")
-            } else {
-                note.removeObserver(self, forKeyPath: "contents")
-            }
-        }
-    }
-    
-    //MARK: Action
-    
-    @IBAction func buttonItemClick_Cancel(_ sender: Any) {
-        self.close()
-    }
-
-    @IBAction func buttonItemClick_Sure(_ sender: Any) {
-        if let note = self.note {
-            if let markupNote = note as? CPDFMarkupAnnotation {
-                markupNote.setMarkupText(self.contentTextView.string)
-            } else {
-                note.contents = self.contentTextView.string 
-            }
-            
-            NotificationCenter.default.post(
-                name: Notification.Name("CPDFListViewAnnotationsAttributeHasChangeNotification"),
-                object: ["keyPath": "text", "object": note]
-            )
-        }
-        
-        self.close()
-    }
-    
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        if context == &CNoteWindowNoteObservationContext {
-            if keyPath == "contents" {
-                synchronizeWindowTitleWithDocumentName()
-            } else if keyPath == "markupText" {
-                synchronizeWindowTitleWithDocumentName()
-                if let note = self.note as? CPDFMarkupAnnotation {
-                    contentTextView.string = note.markupText() ?? ""
-                }
-            }
-        } else {
-            super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
-        }
-    }
-}
-
-extension CPDFListAnnotationNoteWindowController: NSTextViewDelegate {
-    func textDidChange(_ notification: Notification) {
-        if notification.object as AnyObject === contentTextView {
-            if contentTextView.string.count > 0 {
-                contentTextView.placeholderLabel.isHidden = true
-            } else {
-                contentTextView.placeholderLabel.isHidden = false
-            }
-        }
-    }
-    
-    @objc func controlTextDidChange(_ obj: Notification) {
-        // 在这里添加 controlTextDidChange 方法的实现
-    }
-}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListAnnotationNoteWindowController.xib

@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="CPDFListAnnotationNoteWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="cancelButton" destination="oTs-Lx-i2P" id="ud5-Wn-eEf"/>
-                <outlet property="contentBox" destination="M3J-EC-MnB" id="z4S-lR-uP8"/>
-                <outlet property="contentTextView" destination="Uh9-lF-veX" id="DQ4-3u-ytL"/>
-                <outlet property="sureButton" destination="5YO-PQ-Jry" id="PS6-4b-yiI"/>
-                <outlet property="titleLabel" destination="lFm-XQ-Nwc" id="TYG-dL-YfE"/>
-                <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="F0z-JX-Cv5">
-            <windowStyleMask key="styleMask" titled="YES" fullSizeContentView="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="1019" y="610" width="432" height="222"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
-            <value key="minSize" type="size" width="432" height="222"/>
-            <value key="maxSize" type="size" width="432" height="222"/>
-            <value key="minFullScreenContentSize" type="size" width="432" height="222"/>
-            <value key="maxFullScreenContentSize" type="size" width="432" height="222"/>
-            <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="432" height="222"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oTs-Lx-i2P">
-                        <rect key="frame" x="233" y="9" width="94" height="44"/>
-                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="nTr-Lz-ngY">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                            <string key="keyEquivalent" base64-UTF8="YES">
-Gw
-</string>
-                        </buttonCell>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="80" id="GJJ-WK-ESM"/>
-                            <constraint firstAttribute="height" constant="32" id="fAB-6b-WIL"/>
-                        </constraints>
-                        <connections>
-                            <action selector="buttonItemClick_Cancel:" target="-2" id="NKY-2l-jfb"/>
-                        </connections>
-                    </button>
-                    <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="M3J-EC-MnB">
-                        <rect key="frame" x="16" y="64" width="400" height="108"/>
-                        <view key="contentView" id="G9Q-xv-4f5">
-                            <rect key="frame" x="1" y="1" width="398" height="106"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DMr-kv-h9X">
-                                    <rect key="frame" x="0.0" y="0.0" width="398" height="106"/>
-                                    <clipView key="contentView" drawsBackground="NO" id="i1t-gU-3aH">
-                                        <rect key="frame" x="0.0" y="0.0" width="383" height="106"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <subviews>
-                                            <textView drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="Uh9-lF-veX">
-                                                <rect key="frame" x="0.0" y="0.0" width="383" height="106"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                <size key="minSize" width="383" height="106"/>
-                                                <size key="maxSize" width="398" height="10000000"/>
-                                                <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                            </textView>
-                                        </subviews>
-                                    </clipView>
-                                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="h2O-zc-SQO">
-                                        <rect key="frame" x="-100" y="-100" width="225" height="15"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                    </scroller>
-                                    <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="e6O-T1-Mzb">
-                                        <rect key="frame" x="383" y="0.0" width="15" height="106"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                    </scroller>
-                                </scrollView>
-                            </subviews>
-                            <constraints>
-                                <constraint firstItem="DMr-kv-h9X" firstAttribute="leading" secondItem="G9Q-xv-4f5" secondAttribute="leading" id="0NG-Jp-02d"/>
-                                <constraint firstItem="DMr-kv-h9X" firstAttribute="top" secondItem="G9Q-xv-4f5" secondAttribute="top" id="Fnp-ea-4F8"/>
-                                <constraint firstAttribute="trailing" secondItem="DMr-kv-h9X" secondAttribute="trailing" id="cyi-ND-8h3"/>
-                                <constraint firstAttribute="bottom" secondItem="DMr-kv-h9X" secondAttribute="bottom" id="z2L-S0-aFc"/>
-                            </constraints>
-                        </view>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="400" id="RHv-UM-KlJ"/>
-                            <constraint firstAttribute="height" constant="108" id="mdD-Gj-JU1"/>
-                        </constraints>
-                        <color key="borderColor" red="0.0" green="0.0" blue="0.0" alpha="0.2406664922" colorSpace="custom" customColorSpace="sRGB"/>
-                    </box>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5YO-PQ-Jry">
-                        <rect key="frame" x="329" y="9" width="94" height="44"/>
-                        <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PGR-iC-CVd">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                            <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
-                        </buttonCell>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="32" id="7L0-nN-vjJ"/>
-                            <constraint firstAttribute="width" constant="80" id="DDp-cb-6ct"/>
-                        </constraints>
-                        <connections>
-                            <action selector="buttonItemClick_Sure:" target="-2" id="wk4-Fn-MYM"/>
-                        </connections>
-                    </button>
-                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lFm-XQ-Nwc">
-                        <rect key="frame" x="14" y="187" width="73" height="19"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Add Note" id="jgq-BQ-kjA">
-                            <font key="font" metaFont="system" size="16"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </subviews>
-                <constraints>
-                    <constraint firstItem="5YO-PQ-Jry" firstAttribute="top" secondItem="M3J-EC-MnB" secondAttribute="bottom" constant="16" id="10B-fm-aiQ"/>
-                    <constraint firstItem="M3J-EC-MnB" firstAttribute="top" secondItem="lFm-XQ-Nwc" secondAttribute="bottom" constant="15" id="2Qy-KK-x7y"/>
-                    <constraint firstItem="M3J-EC-MnB" firstAttribute="leading" secondItem="lFm-XQ-Nwc" secondAttribute="leading" id="4ff-bC-qLv"/>
-                    <constraint firstAttribute="bottom" secondItem="5YO-PQ-Jry" secondAttribute="bottom" constant="16" id="4jI-If-pwG"/>
-                    <constraint firstItem="lFm-XQ-Nwc" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="16" id="K2F-DA-gl9"/>
-                    <constraint firstAttribute="trailing" secondItem="5YO-PQ-Jry" secondAttribute="trailing" constant="16" id="MAe-bP-Mz6"/>
-                    <constraint firstAttribute="trailing" secondItem="M3J-EC-MnB" secondAttribute="trailing" constant="16" id="UaP-YW-fGl"/>
-                    <constraint firstItem="5YO-PQ-Jry" firstAttribute="leading" secondItem="oTs-Lx-i2P" secondAttribute="trailing" constant="16" id="UhW-Y9-Cbo"/>
-                    <constraint firstItem="lFm-XQ-Nwc" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="16" id="XMp-EQ-7rZ"/>
-                    <constraint firstItem="5YO-PQ-Jry" firstAttribute="centerY" secondItem="oTs-Lx-i2P" secondAttribute="centerY" id="ibf-T1-Q4f"/>
-                </constraints>
-            </view>
-            <connections>
-                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
-            </connections>
-            <point key="canvasLocation" x="96" y="93"/>
-        </window>
-    </objects>
-</document>

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/TextBox/KMTextBoxController.swift

@@ -296,8 +296,8 @@ class KMTextBoxController: NSViewController {
             opacity = annotation.opacity
             
             //Line
-            lineStyle = annotation.border.style
-            lineWidth = annotation.border.lineWidth
+            lineStyle = annotation.border?.style
+            lineWidth = annotation.border?.lineWidth
             var dash = 1.0
             for dashPattern in annotation.dashPattern() {
                 if let value = dashPattern as? CGFloat {

PDF Office/PDF Master/KMClass/PDFListView/Mode/KMNAnnotationPopMode.swift

@@ -8,44 +8,44 @@
 import Cocoa
 
 @objc public enum ListViewPopType: Int, CaseIterable{
-    case GeneraAnnotation = 0
-    case FreeTextAnnotation
-    case ShapeAnnotation
-    case LinkAnnotation
-    case FormAnnotation
-    case FormRadioAnnotation
-    case MultpleAnnotation
+    case generaAnnotation = 0
+    case freeTextAnnotation
+    case shapeAnnotation
+    case linkAnnotation
+    case formAnnotation
+    case formRadioAnnotation
+    case multpleAnnotation
     
-    case PopTypeNone
+    case popTypeNone
 }
 
 @objc public enum linkDetailType: Int, CaseIterable{
-    case LinkSetting
-    case Page
-    case Url
-    case Email
+    case linkSetting
+    case page
+    case url
+    case email
 }
 
 @objc public enum DetailPopType: Int, CaseIterable{
-    case FreeTextAlight = 0
-    case ContentEditAlight
-    case FreeTextDoubleAlight
+    case freeTextAlight = 0
+    case contentEditAlight
+    case freeTextDoubleAlight
     case doubleObjectAlight
-    case FreeTextMultpleAlight
-    case MultpleObjectAlight
+    case freeTextMultpleAlight
+    case multpleObjectAlight
     
-    case DetailNone
+    case detailNone
 }
 
 @objc public enum ObjectAlignType: Int, CaseIterable{
-    case AlightLeft = 0
-    case AlightRight
-    case AlightTop
-    case AlightVer
-    case AlightHor
-    case AlightBottom
-    case AverageVer
-    case AverageHor
+    case alightLeft = 0
+    case alightRight
+    case alightTop
+    case alightVer
+    case alightHor
+    case alightBottom
+    case averageVer
+    case averageHor
 }
 
 @objc public enum ListViewDetailPopType: Int, CaseIterable{
@@ -59,7 +59,7 @@ class KMNAnnotationPopMode: NSObject {
     private(set) var annotation: CPDFAnnotation?
     private(set) var annotations: [CPDFAnnotation] = []
     private(set) var annotationType: CAnnotationType = CAnnotationType.unkown
-    private(set) var popType: ListViewPopType = .PopTypeNone
+    private(set) var popType: ListViewPopType = .popTypeNone
 
     init(pdfAnnotations: [CPDFAnnotation]) {
         super.init()
@@ -74,7 +74,7 @@ class KMNAnnotationPopMode: NSObject {
         let firstAnnotation:CPDFAnnotation = annotations.first ?? CPDFAnnotation.init()
         let type = annotationType(annotation: firstAnnotation)
         if annotations.count == 0 {
-            return .PopTypeNone
+            return .popTypeNone
         } else if annotations.count == 1 {
             return type
         } else {
@@ -89,16 +89,16 @@ class KMNAnnotationPopMode: NSObject {
             if(isSampleAnnotation) {
                 return type
             } else {
-                return .PopTypeNone
+                return .popTypeNone
             }
         }
     }
     
     public func annotationType(annotation:CPDFAnnotation)->ListViewPopType {
         if annotation.isKind(of: CPDFMarkupAnnotation.self) {
-            return .GeneraAnnotation
+            return .generaAnnotation
         } else if annotation.isKind(of: CPDFFreeTextAnnotation.self) {
-            return .FreeTextAnnotation
+            return .freeTextAnnotation
         } else if (annotation.isKind(of: CPDFInkAnnotation.self) ||
                    annotation.isKind(of: CPDFCircleAnnotation.self) ||
                    annotation.isKind(of: CPDFSquareAnnotation.self) ||
@@ -106,27 +106,27 @@ class KMNAnnotationPopMode: NSObject {
                    annotation.isKind(of: CPDFPolygonAnnotation.self) ||
                    annotation.isKind(of: CPDFPolylineAnnotation.self) ||
                    annotation.isKind(of: CSelfSignAnnotation.self)) {
-            return .ShapeAnnotation
+            return .shapeAnnotation
         } else if annotation.isKind(of: CPDFLinkAnnotation.self) {
             if(annotations.count > 1) {
-                return .MultpleAnnotation
+                return .multpleAnnotation
             } else {
-                return .LinkAnnotation
+                return .linkAnnotation
             }
         } else if annotation.isForm() {
             if(annotations.count > 1) {
-                return .MultpleAnnotation
+                return .multpleAnnotation
             } else if(annotations.count == 1) {
                 if(annotation.isKind(of: CPDFButtonWidgetAnnotation.self)) {
                     let button = annotation as! CPDFButtonWidgetAnnotation
                     if(button.controlType() == .radioButtonControl) {
-                        return .FormRadioAnnotation
+                        return .formRadioAnnotation
                     }
                 }
-                return .FormAnnotation
+                return .formAnnotation
             }
         }
-        return .PopTypeNone
+        return .popTypeNone
     }
     
     private func convertAnnotationType(firstAnnotation:CPDFAnnotation) -> CAnnotationType {

PDF Office/PDF Master/KMClass/PDFListView/Mode/KMNEditContentPopMode.swift

@@ -7,20 +7,20 @@
 
 import Cocoa
 @objc public enum EditContentPopType: Int, CaseIterable{
-    case SignTextEdit = 0
-    case SignImageEdit
-    case MultpleTextEdit
-    case MultpleImageEdit
-    case MultpleImageAndText
-    case CropImage
-    case EditNone
+    case signTextEdit = 0
+    case signImageEdit
+    case multpleTextEdit
+    case multpleImageEdit
+    case multpleImageAndText
+    case cropImage
+    case editNone
 }
 
 class KMNEditContentPopMode: NSObject {
     
     private(set) var editArea: CPDFEditArea?
     private(set) var editAreas: [CPDFEditArea] = []
-    private(set) var popType: EditContentPopType = .EditNone
+    private(set) var popType: EditContentPopType = .editNone
 
     init(currentEditAreas: [CPDFEditArea]) {
         super.init()
@@ -35,7 +35,7 @@ class KMNEditContentPopMode: NSObject {
         let editArea:CPDFEditArea = editAreas.first ?? CPDFEditArea.init()
         let editType = contentSingeEditType(editArea: editArea)
         if editAreas.count == 0 {
-            return .EditNone
+            return .editNone
         } else if editAreas.count == 1 {
             return editType
         } else {
@@ -50,24 +50,24 @@ class KMNEditContentPopMode: NSObject {
             if(isSampleAnnotation) {
                 return editType
             } else {
-                return .MultpleImageAndText
+                return .multpleImageAndText
             }
         }
     }
     
     private func contentSingeEditType(editArea:CPDFEditArea)->EditContentPopType {
         if editArea.isTextArea() {
-            return .SignTextEdit
+            return .signTextEdit
         } else if editArea.isImageArea() {
             if let imageEditArea = editArea as? CPDFEditImageArea  {
                 if imageEditArea.isCropMode == true {
-                    return .CropImage
+                    return .cropImage
                 }
             }
-            return .SignImageEdit
+            return .signImageEdit
         }
         
-        return .EditNone
+        return .editNone
     }
     
 }

PDF Office/PDF Master/KMClass/PDFListView/ViewController/KMNPopDetailsViewController.swift

@@ -15,10 +15,10 @@ typealias ObjectChangeAlighCallback = (_ alight:ObjectAlignType) -> ()
 
 class KMNPopDetailsViewController: KMNBaseViewController {
 
-    public var detailPopType:DetailPopType = .DetailNone {
+    public var detailPopType:DetailPopType = .detailNone {
         didSet {
             switch detailPopType {
-            case .FreeTextAlight :
+            case .freeTextAlight :
                 alightRightConstraint.constant = 4
                 alightJustifiedButton.isHidden = true
                 fontAlightView.layoutSubtreeIfNeeded()
@@ -28,7 +28,7 @@ class KMNPopDetailsViewController: KMNBaseViewController {
                 self.view.layoutSubtreeIfNeeded()
                 contentBox.contentView = fontAlightView
                 break
-            case .ContentEditAlight:
+            case .contentEditAlight:
                 alightRightConstraint.constant = 44
                 alightJustifiedButton.isHidden = false
                 fontAlightView.layoutSubtreeIfNeeded()
@@ -50,7 +50,7 @@ class KMNPopDetailsViewController: KMNBaseViewController {
                 contentBox.contentView = objectAlightView
                 
                 break
-            case .FreeTextDoubleAlight:
+            case .freeTextDoubleAlight:
                 objectRightConstraint.constant = 4
                 objectAlightView.layoutSubtreeIfNeeded()
                 objectAverageHorButton.isHidden = true
@@ -62,7 +62,7 @@ class KMNPopDetailsViewController: KMNBaseViewController {
                 contentBox.contentView = objectAlightView
                 
                 break
-            case .MultpleObjectAlight:
+            case .multpleObjectAlight:
                 objectRightConstraint.constant = 80
                 objectAlightView.layoutSubtreeIfNeeded()
                 objectAverageHorButton.isHidden = false
@@ -73,7 +73,7 @@ class KMNPopDetailsViewController: KMNBaseViewController {
                 self.view.layoutSubtreeIfNeeded()
                 contentBox.contentView = objectAlightView
                 break
-            case .FreeTextMultpleAlight:
+            case .freeTextMultpleAlight:
                 objectRightConstraint.constant = 80
                 objectAlightView.layoutSubtreeIfNeeded()
                 objectAverageHorButton.isHidden = false
@@ -84,7 +84,7 @@ class KMNPopDetailsViewController: KMNBaseViewController {
                 self.view.layoutSubtreeIfNeeded()
                 contentBox.contentView = objectAlightView
                 break
-            case .DetailNone:
+            case .detailNone:
                 break
             }
         }
@@ -125,7 +125,7 @@ class KMNPopDetailsViewController: KMNBaseViewController {
         }
     }
     
-    public var objectAlignType:ObjectAlignType = .AlightLeft {
+    public var objectAlignType:ObjectAlignType = .alightLeft {
         didSet {
             if objectAlightLeftButton.properties.state == .pressed {
                 objectAlightLeftButton.properties.state = .normal
@@ -162,28 +162,28 @@ class KMNPopDetailsViewController: KMNBaseViewController {
             
             var button:ComponentButton = objectAlightLeftButton
             switch objectAlignType {
-            case .AlightLeft :
+            case .alightLeft :
                 button = objectAlightLeftButton
                 break
-            case .AlightRight:
+            case .alightRight:
                 button = objectAlightRightButton
                 break
-            case .AlightTop:
+            case .alightTop:
                 button = objectAlightTopButton
                 break
-            case .AlightVer:
+            case .alightVer:
                 button = objectAlightVerButton
                 break
-            case .AlightHor:
+            case .alightHor:
                 button = objectAlightHorButton
                 break
-            case .AlightBottom:
+            case .alightBottom:
                 button = objectAlightBottomButton
                 break
-            case .AverageVer:
+            case .averageVer:
                 button = objectAverageVerButton
                 break
-            case .AverageHor:
+            case .averageHor:
                 button = objectAverageHorButton
                 break
             }
@@ -352,57 +352,57 @@ class KMNPopDetailsViewController: KMNBaseViewController {
     }
     
     @objc func objectAlightLeftClick(_ sender: NSView) {
-        if objectAlignType != .AlightLeft {
-            objectAlignType = .AlightLeft
+        if objectAlignType != .alightLeft {
+            objectAlignType = .alightLeft
             objectChangeAlighCallback?(objectAlignType)
         }
     }
     
     @objc func objectAlightRightClick(_ sender: NSView) {
-        if objectAlignType != .AlightRight {
-            objectAlignType = .AlightRight
+        if objectAlignType != .alightRight {
+            objectAlignType = .alightRight
             objectChangeAlighCallback?(objectAlignType)
         }
     }
     
     @objc func objectAlightTopClick(_ sender: NSView) {
-        if objectAlignType != .AlightTop {
-            objectAlignType = .AlightTop
+        if objectAlignType != .alightTop {
+            objectAlignType = .alightTop
             objectChangeAlighCallback?(objectAlignType)
         }
     }
     
     @objc func objectAlightVerClick(_ sender: NSView) {
-        if objectAlignType != .AlightVer {
-            objectAlignType = .AlightVer
+        if objectAlignType != .alightVer {
+            objectAlignType = .alightVer
             objectChangeAlighCallback?(objectAlignType)
         }
     }
     
     @objc func objectAlightHorClick(_ sender: NSView) {
-        if objectAlignType != .AlightHor {
-            objectAlignType = .AlightHor
+        if objectAlignType != .alightHor {
+            objectAlignType = .alightHor
             objectChangeAlighCallback?(objectAlignType)
         }
     }
     
     @objc func objectAlightBottomClicked(_ sender: NSView) {
-        if objectAlignType != .AlightBottom {
-            objectAlignType = .AlightBottom
+        if objectAlignType != .alightBottom {
+            objectAlignType = .alightBottom
             objectChangeAlighCallback?(objectAlignType)
         }
     }
     
     @objc func objectAverageVerClicked(_ sender: NSView) {
-        if objectAlignType != .AverageVer {
-            objectAlignType = .AverageVer
+        if objectAlignType != .averageVer {
+            objectAlignType = .averageVer
             objectChangeAlighCallback?(objectAlignType)
         }
     }
     
     @objc func objectAverageHorClicked(_ sender: NSView) {
-        if objectAlignType != .AverageHor {
-            objectAlignType = .AverageHor
+        if objectAlignType != .averageHor {
+            objectAlignType = .averageHor
             objectChangeAlighCallback?(objectAlignType)
         }
     }

PDF Office/PDF Master/KMClass/PDFListView/ViewController/KMNPopDetailsViewController.xib

@@ -61,58 +61,58 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="BHh-oJ-ihk" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="8" y="4" width="32" height="32"/>
+                    <rect key="frame" x="8" y="3" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="KVs-0W-76G"/>
+                        <constraint firstAttribute="height" constant="34" id="KVs-0W-76G"/>
                         <constraint firstAttribute="width" constant="32" id="dh0-qs-ZmX"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="eZX-aG-Y1P" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="44" y="4" width="32" height="32"/>
+                    <rect key="frame" x="44" y="3" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="82X-DW-MJB"/>
-                        <constraint firstAttribute="height" constant="32" id="RXe-Dh-FHZ"/>
+                        <constraint firstAttribute="height" constant="34" id="RXe-Dh-FHZ"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="jd5-cs-d7J" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="80" y="4" width="32" height="32"/>
+                    <rect key="frame" x="80" y="3" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="CFm-T0-vZo"/>
+                        <constraint firstAttribute="height" constant="34" id="CFm-T0-vZo"/>
                         <constraint firstAttribute="width" constant="32" id="tLr-xp-Ou3"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="oh5-ch-Lgt" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="116" y="4" width="32" height="32"/>
+                    <rect key="frame" x="116" y="3" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="ES7-QB-S4x"/>
+                        <constraint firstAttribute="height" constant="34" id="ES7-QB-S4x"/>
                         <constraint firstAttribute="width" constant="32" id="Vbh-ac-yg7"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="v8a-D5-zIi" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="152" y="4" width="32" height="32"/>
+                    <rect key="frame" x="152" y="3" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="lLW-jQ-XlP"/>
+                        <constraint firstAttribute="height" constant="34" id="lLW-jQ-XlP"/>
                         <constraint firstAttribute="width" constant="32" id="m83-uf-ixS"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="hoF-Gk-cnA" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="188" y="4" width="32" height="32"/>
+                    <rect key="frame" x="188" y="3" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="dLZ-aW-4Ba"/>
-                        <constraint firstAttribute="height" constant="32" id="x7T-OP-8EI"/>
+                        <constraint firstAttribute="height" constant="34" id="x7T-OP-8EI"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="hLk-ug-XEP" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="224" y="4" width="32" height="32"/>
+                    <rect key="frame" x="224" y="3" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="kPy-Ij-e6p"/>
-                        <constraint firstAttribute="height" constant="32" id="mIa-Hj-bY5"/>
+                        <constraint firstAttribute="height" constant="34" id="mIa-Hj-bY5"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="kck-xy-Bee" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="260" y="4" width="32" height="32"/>
+                    <rect key="frame" x="260" y="3" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="9Zj-iG-413"/>
+                        <constraint firstAttribute="height" constant="34" id="9Zj-iG-413"/>
                         <constraint firstAttribute="width" constant="32" id="fpF-Ad-hGg"/>
                     </constraints>
                 </customView>
@@ -120,14 +120,14 @@
             <constraints>
                 <constraint firstItem="kck-xy-Bee" firstAttribute="centerY" secondItem="NZw-tw-zQ6" secondAttribute="centerY" id="1S0-Qi-LNX"/>
                 <constraint firstItem="v8a-D5-zIi" firstAttribute="centerY" secondItem="NZw-tw-zQ6" secondAttribute="centerY" id="2Ze-xp-lwj"/>
-                <constraint firstItem="BHh-oJ-ihk" firstAttribute="top" secondItem="NZw-tw-zQ6" secondAttribute="top" constant="4" id="3zY-e4-RCg"/>
+                <constraint firstItem="BHh-oJ-ihk" firstAttribute="top" secondItem="NZw-tw-zQ6" secondAttribute="top" constant="3" id="3zY-e4-RCg"/>
                 <constraint firstItem="oh5-ch-Lgt" firstAttribute="centerY" secondItem="NZw-tw-zQ6" secondAttribute="centerY" id="ITD-fT-jQG"/>
                 <constraint firstItem="BHh-oJ-ihk" firstAttribute="leading" secondItem="NZw-tw-zQ6" secondAttribute="leading" constant="8" id="IbT-ya-21s"/>
                 <constraint firstItem="hLk-ug-XEP" firstAttribute="centerY" secondItem="NZw-tw-zQ6" secondAttribute="centerY" id="IhF-BJ-ArI"/>
                 <constraint firstAttribute="trailing" secondItem="kck-xy-Bee" secondAttribute="trailing" constant="8" id="Lkm-qt-gXQ"/>
                 <constraint firstItem="v8a-D5-zIi" firstAttribute="leading" secondItem="oh5-ch-Lgt" secondAttribute="trailing" constant="4" id="Qc6-rR-5Ml"/>
                 <constraint firstItem="hoF-Gk-cnA" firstAttribute="leading" secondItem="v8a-D5-zIi" secondAttribute="trailing" constant="4" id="Qmr-Xo-Ig6"/>
-                <constraint firstAttribute="bottom" secondItem="BHh-oJ-ihk" secondAttribute="bottom" constant="4" id="SpC-Ie-Yz3"/>
+                <constraint firstAttribute="bottom" secondItem="BHh-oJ-ihk" secondAttribute="bottom" constant="3" id="SpC-Ie-Yz3"/>
                 <constraint firstItem="jd5-cs-d7J" firstAttribute="centerY" secondItem="NZw-tw-zQ6" secondAttribute="centerY" id="Tja-ER-4Bz"/>
                 <constraint firstItem="jd5-cs-d7J" firstAttribute="leading" secondItem="eZX-aG-Y1P" secondAttribute="trailing" constant="4" id="W1H-p9-1WZ"/>
                 <constraint firstItem="eZX-aG-Y1P" firstAttribute="centerY" secondItem="NZw-tw-zQ6" secondAttribute="centerY" id="as9-BI-54q"/>
@@ -144,31 +144,31 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="trq-3R-XzC" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="8" y="4" width="32" height="32"/>
+                    <rect key="frame" x="8" y="3" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="79b-0z-STl"/>
-                        <constraint firstAttribute="height" constant="32" id="g59-YV-aVT"/>
+                        <constraint firstAttribute="height" constant="34" id="g59-YV-aVT"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Mr4-6p-HcJ" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="44" y="4" width="32" height="32"/>
+                    <rect key="frame" x="44" y="3" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="ECM-iT-SBz"/>
-                        <constraint firstAttribute="height" constant="32" id="qyj-vf-eXp"/>
+                        <constraint firstAttribute="height" constant="34" id="qyj-vf-eXp"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="7cZ-Dd-yFv" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="80" y="4" width="32" height="32"/>
+                    <rect key="frame" x="80" y="3" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="Isy-Pu-h7q"/>
+                        <constraint firstAttribute="height" constant="34" id="Isy-Pu-h7q"/>
                         <constraint firstAttribute="width" constant="32" id="gFd-Hp-Zz6"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="lgx-yS-dAK" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="116" y="4" width="32" height="32"/>
+                    <rect key="frame" x="116" y="3" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="ohz-y3-xCz"/>
-                        <constraint firstAttribute="height" constant="32" id="wu2-Jy-nZx"/>
+                        <constraint firstAttribute="height" constant="34" id="wu2-Jy-nZx"/>
                     </constraints>
                 </customView>
             </subviews>
@@ -176,10 +176,10 @@
                 <constraint firstItem="trq-3R-XzC" firstAttribute="leading" secondItem="xiW-dB-ByQ" secondAttribute="leading" constant="8" id="5MZ-e1-Rho"/>
                 <constraint firstAttribute="trailing" secondItem="lgx-yS-dAK" secondAttribute="trailing" constant="8" id="Bco-YM-ntP"/>
                 <constraint firstItem="7cZ-Dd-yFv" firstAttribute="centerY" secondItem="xiW-dB-ByQ" secondAttribute="centerY" id="Bsn-Y6-ozL"/>
-                <constraint firstItem="trq-3R-XzC" firstAttribute="top" secondItem="xiW-dB-ByQ" secondAttribute="top" constant="4" id="HcM-kH-uhn"/>
+                <constraint firstItem="trq-3R-XzC" firstAttribute="top" secondItem="xiW-dB-ByQ" secondAttribute="top" constant="3" id="HcM-kH-uhn"/>
                 <constraint firstItem="Mr4-6p-HcJ" firstAttribute="leading" secondItem="trq-3R-XzC" secondAttribute="trailing" constant="4" id="NLH-yO-0MP"/>
                 <constraint firstItem="lgx-yS-dAK" firstAttribute="centerY" secondItem="xiW-dB-ByQ" secondAttribute="centerY" id="c8U-m8-9UW"/>
-                <constraint firstAttribute="bottom" secondItem="trq-3R-XzC" secondAttribute="bottom" constant="4" id="cIt-op-XTx"/>
+                <constraint firstAttribute="bottom" secondItem="trq-3R-XzC" secondAttribute="bottom" constant="3" id="cIt-op-XTx"/>
                 <constraint firstItem="Mr4-6p-HcJ" firstAttribute="centerY" secondItem="xiW-dB-ByQ" secondAttribute="centerY" id="dgN-x3-ogb"/>
                 <constraint firstItem="7cZ-Dd-yFv" firstAttribute="leading" secondItem="Mr4-6p-HcJ" secondAttribute="trailing" constant="4" id="k35-69-dGo"/>
                 <constraint firstAttribute="trailing" secondItem="7cZ-Dd-yFv" secondAttribute="trailing" constant="44" id="x9L-G8-5lT"/>

PDF Office/PDF Master/KMClass/PDFListView/WindowController/KMNPopContentEditWindowController.swift

@@ -10,13 +10,15 @@ import Cocoa
 import KMComponentLibrary
 
 class KMNPopContentEditWindowController: KMNBaseWindowController {
-    public var editType:EditContentPopType = .EditNone {
+    public var editType:EditContentPopType = .editNone {
         didSet {
             rightOffsetConstraint.constant = 41.0
             paneBox.isHidden = false
             
             switch editType {
-            case .SignTextEdit :
+            case .signTextEdit :
+                textPopView.layoutSubtreeIfNeeded()
+                
                 operationWidthConstraint.constant = textPopView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = textPopView
@@ -25,14 +27,18 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 fontAlightButton.properties.icon = NSImage(named: "KMNImageNameListViewPopAlightLeft")
                 fontAlightButton.reloadData()
                 break
-            case .SignImageEdit:
+            case .signImageEdit:
+                imagePopView.layoutSubtreeIfNeeded()
+
                 congfigSignImageUI()
                 
                 operationWidthConstraint.constant = imagePopView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = imagePopView
                 break
-            case .MultpleTextEdit:
+            case .multpleTextEdit:
+                textPopView.layoutSubtreeIfNeeded()
+
                 operationWidthConstraint.constant = textPopView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = textPopView
@@ -41,26 +47,32 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 fontAlightButton.properties.icon = NSImage(named: "KMNImageNameListViewPopAlightLeft")
                 fontAlightButton.reloadData()
                 break
-            case .MultpleImageEdit:
+            case .multpleImageEdit:
+                imagePopView.layoutSubtreeIfNeeded()
+
                 congfigMultpleImageUI()
                 
                 operationWidthConstraint.constant = imagePopView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = imagePopView
                 break
-            case .MultpleImageAndText:
+            case .multpleImageAndText:
+                alightView.layoutSubtreeIfNeeded()
+
                 operationWidthConstraint.constant = alightView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = alightView
                 break
-            case .CropImage:
+            case .cropImage:
+                cropPopView.layoutSubtreeIfNeeded()
+
                 rightOffsetConstraint.constant = 0
                 paneBox.isHidden = true
                 operationWidthConstraint.constant = cropPopView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = cropPopView
                 break
-            case .EditNone:
+            case .editNone:
                 break
             }
         }
@@ -82,7 +94,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
             let editPopType = editContentPopMode.popType
             editType = editPopType
             
-            if(editType == .SignTextEdit || editType == .MultpleTextEdit) {
+            if(editType == .signTextEdit || editType == .multpleTextEdit) {
                 let textEditAreas = listView?.km_editingTextAreas()
                 let oldColor:NSColor? = fontColor
                 let firstTextEditArea = textEditAreas?.first
@@ -235,8 +247,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
         }
     }
     
-    
-    private var objectAlign:ObjectAlignType = .AlightLeft {
+    private var objectAlign:ObjectAlignType = .alightLeft {
         didSet {
             var zeroRect = NSRect.null
             var highestRect = NSZeroRect
@@ -296,7 +307,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
             var newBoundsArray: [String] = []
             
             switch objectAlign {
-            case .AlightLeft :
+            case .alightLeft :
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -307,7 +318,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightLeft")
                 break
-            case .AlightRight:
+            case .alightRight:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -318,7 +329,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightRight")
                 break
-            case .AlightTop:
+            case .alightTop:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -330,7 +341,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightTop")
                 break
                 
-            case .AlightVer:
+            case .alightVer:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -341,7 +352,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightVer")
                 break
-            case .AlightHor:
+            case .alightHor:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -352,7 +363,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightHor")
                 break
-            case .AlightBottom:
+            case .alightBottom:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -363,7 +374,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightBottom")
                 break
-            case .AverageVer:
+            case .averageVer:
                 let middleGap = zeroRect.height - topestRect.height - bottomestRect.height
                 let otherAreasTotalHeight = totalHeight - topestRect.height - bottomestRect.height
                 
@@ -398,7 +409,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjecAlignAverageVer")
                 break
-            case .AverageHor:
+            case .averageHor:
                 let middleGap = zeroRect.width - leftestRect.width - rightestRect.width
                 let otherAreasTotalWidth = totalWidth - leftestRect.width - rightestRect.width
                 
@@ -651,7 +662,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
             
             var positionRect = self.window?.frame ?? CGRectZero
             positionRect.origin.x = positionNew.x - positionRect.width/2
-            positionRect.origin.y = positionNew.y + popOffSet
+            positionRect.origin.y = positionNew.y + popOffSet + CGFloat(truncating: listView.editingConfig().editAreaMargin)
             
             self.window?.setFrame(positionRect, display: true)
         }
@@ -754,21 +765,49 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
     @objc func fontBoldButtonClicked(_ sender: NSView) {
         listView?.setEditingTextarea_Bold()
         updatePDFViewCallback?()
+        let textEditAreas = listView?.km_editingTextAreas()
+        let newBolds:[Bool] = listView?.km_editTextAreasFontBolds(textEditAreas ?? []) ?? []
+
+        if newBolds.first == false {
+            fontBoldSelectorItem.properties.state = .normal
+            fontBoldSelectorItem.reloadData()
+        }
     }
     
     @objc func fontItalicButtonClicked(_ sender: NSView) {
         listView?.setEditingTextarea_Italic()
         updatePDFViewCallback?()
+        let textEditAreas = listView?.km_editingTextAreas()
+        let newItalics:[Bool] = listView?.km_editTextAreasFontItalics(textEditAreas ?? []) ?? []
+
+        if newItalics.first == false {
+            fontItalicSelectorItem.properties.state = .normal
+            fontItalicSelectorItem.reloadData()
+        }
     }
     
     @objc func fontUnderLineButtonClicked(_ sender: NSView) {
         listView?.setEditingTextarea_Under()
         updatePDFViewCallback?()
+        let textEditAreas = listView?.km_editingTextAreas()
+        let newUnders:[Bool] = listView?.km_editTextAreasFontUnder(textEditAreas ?? []) ?? []
+
+        if newUnders.first == false {
+            fontUnderLineSelectorItem.properties.state = .normal
+            fontUnderLineSelectorItem.reloadData()
+        }
     }
     
     @objc func fontStrikeoutLineButtonClicked(_ sender: NSView) {
         listView?.setEditingTextarea_Strikeout()
         updatePDFViewCallback?()
+        let textEditAreas = listView?.km_editingTextAreas()
+        let newStrikeouts:[Bool] = listView?.km_editTextAreasFontStrikeout(textEditAreas ?? []) ?? []
+
+        if newStrikeouts.first == false {
+            fontStrikeoutLineSelectorItem.properties.state = .normal
+            fontStrikeoutLineSelectorItem.reloadData()
+        }
     }
     
     @objc func fontSizeZoomOutButtonClicked(_ sender: NSView) {
@@ -810,7 +849,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
             if (editContentPopMode.editAreas.count == 2) {
                 vc.detailPopType = .doubleObjectAlight
             } else if (editContentPopMode.editAreas.count > 2) {
-                vc.detailPopType = .MultpleObjectAlight
+                vc.detailPopType = .multpleObjectAlight
             }
             vc.objectChangeAlighCallback = { [weak self] alight in
                 self?.objectAlign = alight
@@ -834,7 +873,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
             createFilePopover.setValue(true, forKey: "shouldHideAnchor")
             createFilePopover.show(relativeTo: CGRect(x: sender.bounds.origin.x, y: 20, width: sender.bounds.size.width, height: sender.bounds.size.height), of: sender, preferredEdge: .maxY)
             
-            vc.detailPopType = .ContentEditAlight
+            vc.detailPopType = .contentEditAlight
             vc.fontChangeAlighCallback = { [weak self] alight in
                 self?.listView?.setEditingTextarea_Alignment(align: .right)
                 self?.fontAlight = alight
@@ -867,7 +906,7 @@ class KMNPopContentEditWindowController: KMNBaseWindowController {
     
     @objc func cropImageButtonClicked(_ sender: NSView) {
         listView?.cropAction()
-        editType = .CropImage
+        editType = .cropImage
     }
     
     @objc func replaceImageButtonClicked(_ sender: NSView) {

PDF Office/PDF Master/KMClass/PDFListView/WindowController/KMNPopContentEditWindowController.xib

@@ -48,7 +48,7 @@
             <windowStyleMask key="styleMask" titled="YES" 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="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="522" height="42"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -60,13 +60,13 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="gcY-AN-rME">
-                                    <rect key="frame" x="8" y="4" width="452" height="32"/>
+                                    <rect key="frame" x="8" y="3" width="452" height="34"/>
                                     <view key="contentView" id="02z-VH-9ub">
-                                        <rect key="frame" x="0.0" y="0.0" width="452" height="32"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="452" height="34"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     </view>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="4Uc-vl-YrJ"/>
+                                        <constraint firstAttribute="height" constant="34" id="4Uc-vl-YrJ"/>
                                         <constraint firstAttribute="width" constant="452" id="Vrw-lS-VU7"/>
                                     </constraints>
                                 </box>
@@ -108,8 +108,8 @@
                             </subviews>
                             <constraints>
                                 <constraint firstAttribute="bottom" secondItem="Asu-CO-giT" secondAttribute="bottom" constant="4" id="Igm-Ly-mmW"/>
-                                <constraint firstAttribute="bottom" secondItem="gcY-AN-rME" secondAttribute="bottom" constant="4" id="Na4-OV-xu6"/>
-                                <constraint firstItem="gcY-AN-rME" firstAttribute="top" secondItem="vS3-lN-nYx" secondAttribute="top" constant="4" id="Nd7-Ec-1HX"/>
+                                <constraint firstAttribute="bottom" secondItem="gcY-AN-rME" secondAttribute="bottom" constant="3" id="Na4-OV-xu6"/>
+                                <constraint firstItem="gcY-AN-rME" firstAttribute="top" secondItem="vS3-lN-nYx" secondAttribute="top" constant="3" id="Nd7-Ec-1HX"/>
                                 <constraint firstItem="gcY-AN-rME" firstAttribute="leading" secondItem="vS3-lN-nYx" secondAttribute="leading" constant="8" id="O0m-w4-wnm"/>
                                 <constraint firstAttribute="trailing" secondItem="gcY-AN-rME" secondAttribute="trailing" constant="60" id="Xpm-rN-REZ"/>
                                 <constraint firstItem="Asu-CO-giT" firstAttribute="top" secondItem="vS3-lN-nYx" secondAttribute="top" constant="4" id="d4f-fG-xp1"/>
@@ -131,180 +131,180 @@
             <point key="canvasLocation" x="-11" y="111"/>
         </window>
         <customView id="QBj-ik-paF">
-            <rect key="frame" x="0.0" y="0.0" width="248" height="32"/>
+            <rect key="frame" x="0.0" y="0.0" width="248" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="rSd-el-gmf" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="Dzw-k8-AWM"/>
-                        <constraint firstAttribute="height" constant="32" id="v3Z-mU-bMH"/>
+                        <constraint firstAttribute="height" constant="34" id="v3Z-mU-bMH"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="tSj-ez-s85" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="36" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="36" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="0yP-g6-vx9"/>
-                        <constraint firstAttribute="height" constant="32" id="MAS-KH-TQm"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="TFV-27-l3v" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="72" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="72" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="9Go-dd-fue"/>
                         <constraint firstAttribute="width" constant="32" id="Mfz-C5-Vej"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="MfB-JU-XFx" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="108" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="108" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="7Zc-qq-QaW"/>
                         <constraint firstAttribute="width" constant="32" id="NNc-Uh-DhD"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="d9r-lw-2AK" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="144" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="144" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="fbx-y2-8qI"/>
-                        <constraint firstAttribute="height" constant="32" id="pEr-Yc-WGW"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Cmu-wz-GeL" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="180" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="180" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="57V-Pn-f7K"/>
-                        <constraint firstAttribute="height" constant="32" id="bEL-yb-wxG"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="SOO-w6-Cmm" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="216" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="216" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="HfZ-RJ-vEr"/>
                         <constraint firstAttribute="width" constant="32" id="efm-rv-k08"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
                 <constraint firstItem="tSj-ez-s85" firstAttribute="leading" secondItem="rSd-el-gmf" secondAttribute="trailing" constant="4" id="1Fn-7x-Fwa"/>
-                <constraint firstItem="Cmu-wz-GeL" firstAttribute="centerY" secondItem="QBj-ik-paF" secondAttribute="centerY" id="23d-wM-Rgx"/>
-                <constraint firstItem="MfB-JU-XFx" firstAttribute="centerY" secondItem="QBj-ik-paF" secondAttribute="centerY" id="3ib-iC-zpv"/>
                 <constraint firstAttribute="trailing" secondItem="Cmu-wz-GeL" secondAttribute="trailing" constant="36" id="4Je-Bh-u7H"/>
                 <constraint firstItem="Cmu-wz-GeL" firstAttribute="leading" secondItem="d9r-lw-2AK" secondAttribute="trailing" constant="4" id="5AF-EJ-gIA"/>
-                <constraint firstItem="d9r-lw-2AK" firstAttribute="centerY" secondItem="QBj-ik-paF" secondAttribute="centerY" id="9AS-DR-QZx"/>
+                <constraint firstAttribute="bottom" secondItem="tSj-ez-s85" secondAttribute="bottom" id="5Iw-UZ-hDt"/>
                 <constraint firstItem="rSd-el-gmf" firstAttribute="leading" secondItem="QBj-ik-paF" secondAttribute="leading" id="AeL-NG-hI8"/>
-                <constraint firstItem="tSj-ez-s85" firstAttribute="centerY" secondItem="QBj-ik-paF" secondAttribute="centerY" id="BXb-M9-eap"/>
+                <constraint firstAttribute="bottom" secondItem="TFV-27-l3v" secondAttribute="bottom" id="D5J-OY-liz"/>
                 <constraint firstItem="d9r-lw-2AK" firstAttribute="leading" secondItem="MfB-JU-XFx" secondAttribute="trailing" constant="4" id="Dua-pz-iWe"/>
+                <constraint firstAttribute="bottom" secondItem="d9r-lw-2AK" secondAttribute="bottom" id="EHk-3h-QtQ"/>
+                <constraint firstItem="MfB-JU-XFx" firstAttribute="top" secondItem="QBj-ik-paF" secondAttribute="top" id="FsM-ky-sEZ"/>
                 <constraint firstItem="MfB-JU-XFx" firstAttribute="leading" secondItem="TFV-27-l3v" secondAttribute="trailing" constant="4" id="MHD-XO-qxG"/>
-                <constraint firstItem="TFV-27-l3v" firstAttribute="centerY" secondItem="QBj-ik-paF" secondAttribute="centerY" id="Moh-aD-Q2Q"/>
-                <constraint firstItem="SOO-w6-Cmm" firstAttribute="centerY" secondItem="QBj-ik-paF" secondAttribute="centerY" id="edh-pV-KtA"/>
+                <constraint firstItem="d9r-lw-2AK" firstAttribute="top" secondItem="QBj-ik-paF" secondAttribute="top" id="Mjm-4O-CxC"/>
+                <constraint firstItem="TFV-27-l3v" firstAttribute="top" secondItem="QBj-ik-paF" secondAttribute="top" id="Rum-Ol-Dwh"/>
+                <constraint firstAttribute="bottom" secondItem="Cmu-wz-GeL" secondAttribute="bottom" id="V5D-V7-m6k"/>
+                <constraint firstAttribute="bottom" secondItem="SOO-w6-Cmm" secondAttribute="bottom" id="X8n-qb-Cuf"/>
+                <constraint firstItem="SOO-w6-Cmm" firstAttribute="top" secondItem="QBj-ik-paF" secondAttribute="top" id="Y33-lt-8Xb"/>
+                <constraint firstAttribute="bottom" secondItem="MfB-JU-XFx" secondAttribute="bottom" id="Zys-9s-WgS"/>
                 <constraint firstItem="SOO-w6-Cmm" firstAttribute="leading" secondItem="Cmu-wz-GeL" secondAttribute="trailing" constant="4" id="hnp-h1-dhh"/>
                 <constraint firstItem="rSd-el-gmf" firstAttribute="top" secondItem="QBj-ik-paF" secondAttribute="top" id="nh6-Kb-Laa"/>
+                <constraint firstItem="Cmu-wz-GeL" firstAttribute="top" secondItem="QBj-ik-paF" secondAttribute="top" id="oQf-HF-BAk"/>
                 <constraint firstItem="TFV-27-l3v" firstAttribute="leading" secondItem="tSj-ez-s85" secondAttribute="trailing" constant="4" id="om9-Ej-h1v"/>
                 <constraint firstAttribute="bottom" secondItem="rSd-el-gmf" secondAttribute="bottom" id="pbt-VJ-87j"/>
+                <constraint firstItem="tSj-ez-s85" firstAttribute="top" secondItem="QBj-ik-paF" secondAttribute="top" id="yVt-uJ-mmD"/>
             </constraints>
             <point key="canvasLocation" x="94" y="232"/>
         </customView>
         <customView id="wCl-Nn-ilD">
-            <rect key="frame" x="0.0" y="0.0" width="448" height="32"/>
+            <rect key="frame" x="0.0" y="0.0" width="448" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="qsd-8b-j41" customClass="ComponentCColorItem" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="Keu-aQ-bej"/>
-                        <constraint firstAttribute="height" constant="32" id="yUR-ep-WpC"/>
+                        <constraint firstAttribute="height" constant="34" id="yUR-ep-WpC"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="lWX-vh-kMR" customClass="ComponentSelect" customModule="KMComponentLibrary">
-                    <rect key="frame" x="36" y="0.0" width="160" height="32"/>
+                    <rect key="frame" x="36" y="0.0" width="160" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="Goj-id-yhX"/>
                         <constraint firstAttribute="width" constant="160" id="pNm-gt-tVS"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="YKs-Kf-rBe" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="200" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="200" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="CQD-cZ-Giz"/>
                         <constraint firstAttribute="width" constant="32" id="Qzq-8J-N6f"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="JMi-1O-Jpi" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="236" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="236" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="WDJ-KD-3KM"/>
-                        <constraint firstAttribute="height" constant="32" id="zCX-ht-Ikn"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="EAu-1y-463" customClass="ComponentCSelector" customModule="KMComponentLibrary">
-                    <rect key="frame" x="272" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="272" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="1gK-TH-1Yf"/>
                         <constraint firstAttribute="width" constant="32" id="4mO-rp-TQh"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Fe0-IT-raT" customClass="ComponentCSelector" customModule="KMComponentLibrary">
-                    <rect key="frame" x="308" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="308" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="lXt-Fp-WuN"/>
                         <constraint firstAttribute="width" constant="32" id="nQi-l7-49q"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="WKu-2m-DcC" customClass="ComponentCSelector" customModule="KMComponentLibrary">
-                    <rect key="frame" x="344" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="344" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="8pX-lH-8L9"/>
                         <constraint firstAttribute="width" constant="32" id="FLv-w8-Fql"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="c5x-Ir-hfr" customClass="ComponentCSelector" customModule="KMComponentLibrary">
-                    <rect key="frame" x="380" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="380" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="NGd-bo-VnG"/>
                         <constraint firstAttribute="width" constant="32" id="STF-0h-t1q"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="abx-ls-sxb" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="416" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="416" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="QeA-fb-jZi"/>
                         <constraint firstAttribute="width" constant="32" id="bDz-mD-XTY"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
-                <constraint firstItem="c5x-Ir-hfr" firstAttribute="centerY" secondItem="wCl-Nn-ilD" secondAttribute="centerY" id="1AD-lU-0Y6"/>
-                <constraint firstItem="abx-ls-sxb" firstAttribute="centerY" secondItem="wCl-Nn-ilD" secondAttribute="centerY" id="3as-tf-ZfL"/>
                 <constraint firstItem="lWX-vh-kMR" firstAttribute="leading" secondItem="qsd-8b-j41" secondAttribute="trailing" constant="4" id="5vw-To-c0N"/>
                 <constraint firstAttribute="trailing" secondItem="abx-ls-sxb" secondAttribute="trailing" id="7NT-w3-xgY"/>
                 <constraint firstItem="qsd-8b-j41" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="7TS-Yf-o3W"/>
+                <constraint firstItem="JMi-1O-Jpi" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="7z0-Ct-0OK"/>
+                <constraint firstAttribute="bottom" secondItem="JMi-1O-Jpi" secondAttribute="bottom" id="8nV-l4-Im6"/>
                 <constraint firstItem="abx-ls-sxb" firstAttribute="leading" secondItem="c5x-Ir-hfr" secondAttribute="trailing" constant="4" id="F27-6J-NX1"/>
                 <constraint firstItem="WKu-2m-DcC" firstAttribute="leading" secondItem="Fe0-IT-raT" secondAttribute="trailing" constant="4" id="Ibw-Qc-bbl"/>
-                <constraint firstItem="lWX-vh-kMR" firstAttribute="centerY" secondItem="wCl-Nn-ilD" secondAttribute="centerY" id="S8p-VR-m5M"/>
+                <constraint firstAttribute="bottom" secondItem="YKs-Kf-rBe" secondAttribute="bottom" id="KNs-0O-U1g"/>
+                <constraint firstAttribute="bottom" secondItem="WKu-2m-DcC" secondAttribute="bottom" id="M4D-4G-Iry"/>
+                <constraint firstAttribute="bottom" secondItem="c5x-Ir-hfr" secondAttribute="bottom" id="PTI-Fr-0IW"/>
+                <constraint firstItem="EAu-1y-463" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="QXk-AB-dSV"/>
+                <constraint firstItem="abx-ls-sxb" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="UGy-1g-ujI"/>
+                <constraint firstItem="c5x-Ir-hfr" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="V5y-Fv-gda"/>
                 <constraint firstItem="EAu-1y-463" firstAttribute="leading" secondItem="JMi-1O-Jpi" secondAttribute="trailing" constant="4" id="WZ1-1k-Bmk"/>
                 <constraint firstItem="qsd-8b-j41" firstAttribute="leading" secondItem="wCl-Nn-ilD" secondAttribute="leading" id="YRB-Gt-Cr9"/>
-                <constraint firstItem="JMi-1O-Jpi" firstAttribute="centerY" secondItem="wCl-Nn-ilD" secondAttribute="centerY" id="bQN-ix-a3r"/>
-                <constraint firstItem="WKu-2m-DcC" firstAttribute="centerY" secondItem="wCl-Nn-ilD" secondAttribute="centerY" id="crp-Ze-MqI"/>
+                <constraint firstAttribute="bottom" secondItem="lWX-vh-kMR" secondAttribute="bottom" id="bem-IQ-YcP"/>
+                <constraint firstItem="lWX-vh-kMR" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="dHJ-o8-7ir"/>
                 <constraint firstItem="JMi-1O-Jpi" firstAttribute="leading" secondItem="YKs-Kf-rBe" secondAttribute="trailing" constant="4" id="egd-KA-k42"/>
-                <constraint firstItem="YKs-Kf-rBe" firstAttribute="centerY" secondItem="wCl-Nn-ilD" secondAttribute="centerY" id="fJc-qv-BMv"/>
                 <constraint firstItem="YKs-Kf-rBe" firstAttribute="leading" secondItem="lWX-vh-kMR" secondAttribute="trailing" constant="4" id="khr-SP-bFv"/>
                 <constraint firstAttribute="bottom" secondItem="qsd-8b-j41" secondAttribute="bottom" id="l6c-qc-bjd"/>
+                <constraint firstAttribute="bottom" secondItem="Fe0-IT-raT" secondAttribute="bottom" id="mfF-In-ZXn"/>
                 <constraint firstItem="c5x-Ir-hfr" firstAttribute="leading" secondItem="WKu-2m-DcC" secondAttribute="trailing" constant="4" id="mlF-w1-lDQ"/>
-                <constraint firstItem="EAu-1y-463" firstAttribute="centerY" secondItem="wCl-Nn-ilD" secondAttribute="centerY" id="u50-ky-8zY"/>
-                <constraint firstItem="Fe0-IT-raT" firstAttribute="centerY" secondItem="wCl-Nn-ilD" secondAttribute="centerY" id="vJ1-I1-rsU"/>
+                <constraint firstAttribute="bottom" secondItem="EAu-1y-463" secondAttribute="bottom" id="n3K-Ib-A56"/>
+                <constraint firstItem="YKs-Kf-rBe" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="pAD-Qn-fxk"/>
+                <constraint firstItem="Fe0-IT-raT" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="qho-DQ-vDz"/>
+                <constraint firstAttribute="bottom" secondItem="abx-ls-sxb" secondAttribute="bottom" id="szf-1z-AIw"/>
+                <constraint firstItem="WKu-2m-DcC" firstAttribute="top" secondItem="wCl-Nn-ilD" secondAttribute="top" id="tYz-Ga-ofw"/>
                 <constraint firstItem="Fe0-IT-raT" firstAttribute="leading" secondItem="EAu-1y-463" secondAttribute="trailing" constant="4" id="wFS-Uy-zt1"/>
             </constraints>
             <point key="canvasLocation" x="101" y="330"/>
         </customView>
-        <customView id="uaQ-SE-a0I">
-            <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+        <customView misplaced="YES" id="uaQ-SE-a0I">
+            <rect key="frame" x="0.0" y="0.0" width="32" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Bol-GU-xvO" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="RVh-0x-oKr"/>
-                        <constraint firstAttribute="height" constant="32" id="hJZ-ml-Hh3"/>
+                        <constraint firstAttribute="height" constant="34" id="hJZ-ml-Hh3"/>
                     </constraints>
                 </customView>
             </subviews>
@@ -317,29 +317,30 @@
             <point key="canvasLocation" x="78" y="436"/>
         </customView>
         <customView id="eej-36-DQf">
-            <rect key="frame" x="0.0" y="0.0" width="68" height="32"/>
+            <rect key="frame" x="0.0" y="0.0" width="68" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="wkL-64-GtL" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="Y1i-dM-4Iq"/>
-                        <constraint firstAttribute="height" constant="32" id="qCS-lz-RmV"/>
+                        <constraint firstAttribute="height" constant="34" id="qCS-lz-RmV"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="kgz-OW-p3G" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="36" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="36" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="Fxb-ki-ytz"/>
                         <constraint firstAttribute="width" constant="32" id="Uy2-d2-ST8"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="kgz-OW-p3G" secondAttribute="trailing" id="1Lu-5I-Clc"/>
-                <constraint firstItem="wkL-64-GtL" firstAttribute="centerY" secondItem="eej-36-DQf" secondAttribute="centerY" id="TYk-WT-PE5"/>
+                <constraint firstItem="wkL-64-GtL" firstAttribute="top" secondItem="eej-36-DQf" secondAttribute="top" id="A2h-fm-c1b"/>
+                <constraint firstItem="kgz-OW-p3G" firstAttribute="top" secondItem="eej-36-DQf" secondAttribute="top" id="M5r-D5-blF"/>
                 <constraint firstItem="wkL-64-GtL" firstAttribute="leading" secondItem="eej-36-DQf" secondAttribute="leading" id="VW7-d6-D1d"/>
-                <constraint firstItem="kgz-OW-p3G" firstAttribute="centerY" secondItem="eej-36-DQf" secondAttribute="centerY" id="mGQ-Sa-fnE"/>
+                <constraint firstAttribute="bottom" secondItem="wkL-64-GtL" secondAttribute="bottom" id="Zat-A1-Nyd"/>
+                <constraint firstAttribute="bottom" secondItem="kgz-OW-p3G" secondAttribute="bottom" id="esW-b7-Qy6"/>
                 <constraint firstItem="kgz-OW-p3G" firstAttribute="leading" secondItem="wkL-64-GtL" secondAttribute="trailing" constant="4" id="mi7-p6-T8B"/>
             </constraints>
             <point key="canvasLocation" x="72" y="529"/>

PDF Office/PDF Master/KMClass/PDFListView/WindowController/KMNPopOperationWindowController.swift

@@ -17,32 +17,37 @@ typealias UpdatePDFViewCallback = () -> ()
 
 class KMNPopOperationWindowController: KMNBaseWindowController {
     
-    public var popType:ListViewPopType = .GeneraAnnotation {
+    public var popType:ListViewPopType = .popTypeNone {
         didSet {
             rightOffsetConstraint.constant = 45.0
             operationHeightConstraint.constant = 32.0
             paneBox.isHidden = false
             
             switch popType {
-            case .GeneraAnnotation :
+            case .generaAnnotation :
+                generaPopView.layoutSubtreeIfNeeded()
                 operationWidthConstraint.constant = generaPopView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = generaPopView
                 break
-            case .FreeTextAnnotation:
+            case .freeTextAnnotation:
+                fontPopView.layoutSubtreeIfNeeded()
+
                 operationWidthConstraint.constant = fontPopView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = fontPopView
                 break
-            case .ShapeAnnotation:
+            case .shapeAnnotation:
+                shapeView.layoutSubtreeIfNeeded()
+
                 operationWidthConstraint.constant = shapeView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = shapeView
                 break
-            case .LinkAnnotation:
-                linkType = .LinkSetting
+            case .linkAnnotation:
+                linkType = .linkSetting
                 break
-            case .FormAnnotation:
+            case .formAnnotation:
                 formRightConstraint.constant = 0
                 gropNameInput.isHidden = true
                 formView.layoutSubtreeIfNeeded()
@@ -51,20 +56,23 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = formView
                 break
-            case .FormRadioAnnotation:
+            case .formRadioAnnotation:
                 formRightConstraint.constant = 110
                 gropNameInput.isHidden = false
                 formView.layoutSubtreeIfNeeded()
+                
                 operationWidthConstraint.constant = formView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = formView
                 break
-            case .MultpleAnnotation:
+            case .multpleAnnotation:
+                alightView.layoutSubtreeIfNeeded()
+
                 operationWidthConstraint.constant = alightView.bounds.width
                 self.window?.display() //需刷新约束才会有值，不然会变化
                 operationBox.contentView = alightView
                 break
-            case .PopTypeNone:
+            case .popTypeNone:
                 break
                 
             }
@@ -86,19 +94,19 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
         didSet {
             let annotationPopType = annotationPopMode.popType
             popType = annotationPopType
-            if annotationPopType == .GeneraAnnotation {
+            if annotationPopType == .generaAnnotation {
                 let newColor = annotationPopMode.annotationColor()
                 let oldColor = annotationColor
                 if !CPDFListView.isTheSameColor(newColor, anotherColor: oldColor) {
                     annotationColor = newColor
                 }
-            } else if(annotationPopType == .ShapeAnnotation) {
+            } else if(annotationPopType == .shapeAnnotation) {
                 let newColor = annotationPopMode.annotationColor()
                 let oldColor = annotationColor
                 if !CPDFListView.isTheSameColor(newColor, anotherColor: oldColor) {
                     annotationColor = newColor
                 }
-            } else if(annotationPopType == .FreeTextAnnotation) {
+            } else if(annotationPopType == .freeTextAnnotation) {
                 let newColor = annotationPopMode.annotationFontColor()
                 
                 let oldColor = fontColor
@@ -115,15 +123,15 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 if(font?.familyName != compdfFont?.familyName || font?.styleName != compdfFont?.styleName) {
                     compdfFont = font
                 }
-            } else if annotationPopType == .LinkAnnotation {
+            } else if annotationPopType == .linkAnnotation {
                 if annotationPopMode.annotation != nil {
                     linkAnnotation = annotationPopMode.annotation as! CPDFLinkAnnotation
                 }
-            } else if annotationPopType == .FormAnnotation {
+            } else if annotationPopType == .formAnnotation {
                 if annotationPopMode.annotationFieldName() != fildNameString {
                     fildNameString = annotationPopMode.annotationFieldName() ?? ""
                 }
-            } else if annotationPopType == .FormRadioAnnotation {
+            } else if annotationPopType == .formRadioAnnotation {
                 if annotationPopMode.annotationFieldName() != fildNameString {
                     fildNameString = annotationPopMode.annotationFieldName() ?? ""
                 }
@@ -137,10 +145,10 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
     
     private var annotationColor:NSColor?{
         didSet {
-            if popType == .GeneraAnnotation {
+            if popType == .generaAnnotation {
                 generaColorGroup.currentColor = annotationColor
                 generaColorGroup.refreshUI()
-            } else if popType == .ShapeAnnotation {
+            } else if popType == .shapeAnnotation {
                 shapeColorGroup.currentColor = annotationColor
                 shapeColorGroup.refreshUI()
             }
@@ -203,7 +211,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
         }
     }
     
-    private var objectAlignType:ObjectAlignType = .AlightLeft {
+    private var objectAlignType:ObjectAlignType = .alightLeft {
         didSet {
             var zeroRect = NSRect.null
             var highestRect = NSZeroRect
@@ -263,7 +271,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
             var newBoundsArray: [String] = []
             
             switch objectAlignType {
-            case .AlightLeft :
+            case .alightLeft :
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -274,7 +282,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightLeft")
                 break
-            case .AlightRight:
+            case .alightRight:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -285,7 +293,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightRight")
                 break
-            case .AlightTop:
+            case .alightTop:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -297,7 +305,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightTop")
                 break
                 
-            case .AlightVer:
+            case .alightVer:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -308,7 +316,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightVer")
                 break
-            case .AlightHor:
+            case .alightHor:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -319,7 +327,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightHor")
                 break
-            case .AlightBottom:
+            case .alightBottom:
                 for i in 0 ..< objects.count {
                     let object = objects[i]
                     var bounds = object.bounds
@@ -330,7 +338,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjectPopAlightBottom")
                 break
-            case .AverageVer:
+            case .averageVer:
                 let middleGap = zeroRect.height - topestRect.height - bottomestRect.height
                 let otherAreasTotalHeight = totalHeight - topestRect.height - bottomestRect.height
                 
@@ -365,7 +373,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 
                 alightButton.properties.icon = NSImage(named: "KMNImageNameObjecAlignAverageVer")
                 break
-            case .AverageHor:
+            case .averageHor:
                 let middleGap = zeroRect.width - leftestRect.width - rightestRect.width
                 let otherAreasTotalWidth = totalWidth - leftestRect.width - rightestRect.width
                 
@@ -420,10 +428,11 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
         return windowC
     }()
     
-    var linkType:linkDetailType = .LinkSetting {
+    var linkType:linkDetailType = .linkSetting {
         didSet {
-            updateFrame(listView: listView ?? CPDFListView())
-            if linkType == .LinkSetting {
+            if linkType == .linkSetting {
+                linkView.layoutSubtreeIfNeeded()
+                
                 rightOffsetConstraint.constant = 45.0
                 operationHeightConstraint.constant = 32.0
                 operationWidthConstraint.constant = linkView.bounds.width
@@ -431,7 +440,9 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 operationBox.contentView = linkView
                 
                 paneBox.isHidden = false
-            } else if linkType == .Page {
+            } else if linkType == .page {
+                linkPageDetailView.layoutSubtreeIfNeeded()
+
                 rightOffsetConstraint.constant = 8
                 operationWidthConstraint.constant = linkPageDetailView.bounds.width
                 operationHeightConstraint.constant = linkPageDetailView.bounds.height
@@ -440,7 +451,9 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 
                 paneBox.isHidden = true
                 configUrlPopUI()
-            } else if linkType == .Url {
+            } else if linkType == .url {
+                linkUrlDetailView.layoutSubtreeIfNeeded()
+
                 rightOffsetConstraint.constant = 8
                 operationWidthConstraint.constant = linkUrlDetailView.bounds.width
                 operationHeightConstraint.constant = linkUrlDetailView.bounds.height
@@ -449,7 +462,9 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 
                 paneBox.isHidden = true
                 configUrlPopUI()
-            } else if linkType == .Email {
+            } else if linkType == .email {
+                linkUrlDetailView.layoutSubtreeIfNeeded()
+
                 rightOffsetConstraint.constant = 8
                 operationWidthConstraint.constant = linkUrlDetailView.bounds.width
                 operationHeightConstraint.constant = linkUrlDetailView.bounds.height
@@ -459,6 +474,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
                 paneBox.isHidden = true
                 configUrlPopUI()
             }
+            updateFrame(listView: listView ?? CPDFListView())
         }
     }
     
@@ -817,7 +833,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
     
     private func configUrlPopUI() {
         var placeholder = KMNCompanyWebsite
-        if(linkType == .Email) {
+        if(linkType == .email) {
             placeholder = KMNCompanyEamil
         }
         let inputFiedProperty: ComponentInputProperty = ComponentInputProperty(size: .s,
@@ -920,7 +936,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
             createFilePopover.setValue(true, forKey: "shouldHideAnchor")
             createFilePopover.show(relativeTo: CGRect(x: sender.bounds.origin.x, y: 20, width: sender.bounds.size.width, height: sender.bounds.size.height), of: sender, preferredEdge: .maxY)
             
-            vc.detailPopType = .FreeTextAlight
+            vc.detailPopType = .freeTextAlight
             vc.fontChangeAlighCallback = { [weak self] alight in
                 if let freeText = self?.annotationPopMode.annotation as? CPDFFreeTextAnnotation {
                     if self?.listView?.isEdit(withCurrentFreeText: freeText) == true {
@@ -950,15 +966,15 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
     }
     
     @objc func pageLinkButtonClicked(_ sender: NSView) {
-        linkType = .Page
+        linkType = .page
     }
     
     @objc func urlLinkButtonClicked(_ sender: NSView) {
-        linkType = .Url
+        linkType = .url
     }
     
     @objc func emailLinkButtonClicked(_ sender: NSView) {
-        linkType = .Email
+        linkType = .email
     }
     
     @objc func alightButtonClicked(_ sender: NSView) {
@@ -975,9 +991,9 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
             createFilePopover.show(relativeTo: CGRect(x: sender.bounds.origin.x, y: 20, width: sender.bounds.size.width, height: sender.bounds.size.height), of: sender, preferredEdge: .maxY)
             
             if (annotationPopMode.annotations.count == 2) {
-                vc.detailPopType = .FreeTextDoubleAlight
+                vc.detailPopType = .freeTextDoubleAlight
             } else if (annotationPopMode.annotations.count > 2) {
-                vc.detailPopType = .FreeTextMultpleAlight
+                vc.detailPopType = .freeTextMultpleAlight
             }
             
             vc.objectChangeAlighCallback = { [weak self] alight in
@@ -991,9 +1007,9 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
     
     @objc func linkGoButtonClicked(_ sender: NSView) {
         self.window?.resignFirstResponder()
-        if linkType == .Url {
+        if linkType == .url {
             
-        } else if linkType == .Email {
+        } else if linkType == .email {
             
         }
     }
@@ -1001,7 +1017,7 @@ class KMNPopOperationWindowController: KMNBaseWindowController {
     @objc func linkBackButtonClicked(_ sender: NSView) {
         self.window?.resignFirstResponder()
 
-        linkType = .LinkSetting
+        linkType = .linkSetting
     }
     
     @objc func fontColorChange(_ sender: Any) {
@@ -1074,9 +1090,9 @@ extension KMNPopOperationWindowController: ComponentInputDelegate {
             
             updatePDFViewCallback?()
         } else if (inputView == urlInput) {
-            if linkType == .Url {
+            if linkType == .url {
                 
-            } else if linkType == .Email {
+            } else if linkType == .email {
                 
             }
             updatePDFViewCallback?()

PDF Office/PDF Master/KMClass/PDFListView/WindowController/KMNPopOperationWindowController.xib

@@ -62,9 +62,9 @@
             <windowStyleMask key="styleMask" titled="YES" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="511" height="42"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
-            <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="503" height="42"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
+            <view key="contentView" misplaced="YES" id="se5-gp-TjO">
+                <rect key="frame" x="0.0" y="0.0" width="503" height="43"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="iV9-GQ-NJE">
@@ -74,13 +74,13 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="hK7-nm-yiB">
-                                    <rect key="frame" x="8" y="4" width="452" height="32"/>
+                                    <rect key="frame" x="8" y="3" width="452" height="34"/>
                                     <view key="contentView" id="cJm-Sf-LL5">
-                                        <rect key="frame" x="0.0" y="0.0" width="452" height="32"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="452" height="34"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     </view>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="AzC-X8-gDb"/>
+                                        <constraint firstAttribute="height" constant="34" id="AzC-X8-gDb"/>
                                         <constraint firstAttribute="width" constant="452" id="PmJ-AM-Kgc"/>
                                     </constraints>
                                 </box>
@@ -121,8 +121,8 @@
                                 </box>
                             </subviews>
                             <constraints>
-                                <constraint firstAttribute="bottom" secondItem="hK7-nm-yiB" secondAttribute="bottom" constant="4" id="JqZ-ne-c2S"/>
-                                <constraint firstItem="hK7-nm-yiB" firstAttribute="top" secondItem="9j5-uh-fjw" secondAttribute="top" constant="4" id="Okw-o9-mpa"/>
+                                <constraint firstAttribute="bottom" secondItem="hK7-nm-yiB" secondAttribute="bottom" constant="3" id="JqZ-ne-c2S"/>
+                                <constraint firstItem="hK7-nm-yiB" firstAttribute="top" secondItem="9j5-uh-fjw" secondAttribute="top" constant="3" id="Okw-o9-mpa"/>
                                 <constraint firstAttribute="trailing" secondItem="hK7-nm-yiB" secondAttribute="trailing" constant="41" id="TYz-c7-EYo"/>
                                 <constraint firstItem="hK7-nm-yiB" firstAttribute="leading" secondItem="9j5-uh-fjw" secondAttribute="leading" constant="8" id="aAB-Id-B5f"/>
                                 <constraint firstItem="34L-Tp-WUP" firstAttribute="top" secondItem="9j5-uh-fjw" secondAttribute="top" constant="4" id="cwk-Hx-a5r"/>
@@ -145,13 +145,13 @@
             <point key="canvasLocation" x="104.5" y="39"/>
         </window>
         <customView id="bBj-uu-aMr">
-            <rect key="frame" x="0.0" y="0.0" width="200" height="32"/>
+            <rect key="frame" x="0.0" y="0.0" width="200" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="AMl-8z-nXr" customClass="ComponentCColorGroup" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="200" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="200" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="NgO-vf-9bV"/>
+                        <constraint firstAttribute="height" constant="34" id="NgO-vf-9bV"/>
                         <constraint firstAttribute="width" constant="200" id="zVe-na-t80"/>
                     </constraints>
                 </customView>
@@ -165,131 +165,131 @@
             <point key="canvasLocation" x="65" y="239"/>
         </customView>
         <customView id="e0X-Fm-9s1">
-            <rect key="frame" x="0.0" y="0.0" width="304" height="32"/>
+            <rect key="frame" x="0.0" y="0.0" width="304" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="4fg-CE-2Ak" customClass="ComponentCColorItem" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="FaH-oc-Bb7"/>
-                        <constraint firstAttribute="height" constant="32" id="cFY-CA-fjy"/>
+                        <constraint firstAttribute="height" constant="34" id="cFY-CA-fjy"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="uVm-yx-ayt" customClass="ComponentSelect" customModule="KMComponentLibrary">
-                    <rect key="frame" x="36" y="0.0" width="160" height="32"/>
+                    <rect key="frame" x="36" y="0.0" width="160" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="taR-fB-WB2"/>
                         <constraint firstAttribute="width" constant="160" id="web-YB-5WN"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="PhS-9n-Efv" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="200" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="200" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="ZxM-Fn-5Q3"/>
-                        <constraint firstAttribute="height" constant="32" id="uwg-Jr-Bb6"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="C2z-tn-74c" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="236" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="236" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="54g-dE-sRL"/>
-                        <constraint firstAttribute="height" constant="32" id="SOy-ln-gii"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="d4n-gC-WKa" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="272" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="272" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="5zk-qr-VIv"/>
                         <constraint firstAttribute="width" constant="32" id="O7Z-jC-fiY"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
-                <constraint firstItem="uVm-yx-ayt" firstAttribute="centerY" secondItem="e0X-Fm-9s1" secondAttribute="centerY" id="BqI-aV-nte"/>
-                <constraint firstItem="d4n-gC-WKa" firstAttribute="centerY" secondItem="e0X-Fm-9s1" secondAttribute="centerY" id="KvA-ex-dbA"/>
+                <constraint firstItem="d4n-gC-WKa" firstAttribute="top" secondItem="e0X-Fm-9s1" secondAttribute="top" id="G7w-3Y-6P6"/>
                 <constraint firstItem="uVm-yx-ayt" firstAttribute="leading" secondItem="4fg-CE-2Ak" secondAttribute="trailing" constant="4" id="OLG-dt-Ysc"/>
                 <constraint firstItem="PhS-9n-Efv" firstAttribute="leading" secondItem="uVm-yx-ayt" secondAttribute="trailing" constant="4" id="PP8-SN-1GR"/>
-                <constraint firstItem="PhS-9n-Efv" firstAttribute="centerY" secondItem="e0X-Fm-9s1" secondAttribute="centerY" id="Ua4-CJ-m50"/>
+                <constraint firstAttribute="bottom" secondItem="d4n-gC-WKa" secondAttribute="bottom" id="SvU-pk-iUh"/>
+                <constraint firstItem="PhS-9n-Efv" firstAttribute="top" secondItem="e0X-Fm-9s1" secondAttribute="top" id="U1m-p2-Onr"/>
+                <constraint firstAttribute="bottom" secondItem="C2z-tn-74c" secondAttribute="bottom" id="XvY-i9-hvW"/>
+                <constraint firstAttribute="bottom" secondItem="PhS-9n-Efv" secondAttribute="bottom" id="Znh-iO-cQC"/>
                 <constraint firstItem="4fg-CE-2Ak" firstAttribute="leading" secondItem="e0X-Fm-9s1" secondAttribute="leading" id="a2K-bC-TZg"/>
+                <constraint firstAttribute="bottom" secondItem="uVm-yx-ayt" secondAttribute="bottom" id="fQ7-Dw-zy1"/>
+                <constraint firstItem="uVm-yx-ayt" firstAttribute="top" secondItem="e0X-Fm-9s1" secondAttribute="top" id="gvi-0g-HlV"/>
                 <constraint firstAttribute="trailing" secondItem="d4n-gC-WKa" secondAttribute="trailing" id="hRQ-Xx-toV"/>
                 <constraint firstItem="d4n-gC-WKa" firstAttribute="leading" secondItem="C2z-tn-74c" secondAttribute="trailing" constant="4" id="jmk-9e-JWg"/>
                 <constraint firstItem="C2z-tn-74c" firstAttribute="leading" secondItem="PhS-9n-Efv" secondAttribute="trailing" constant="4" id="kYI-8p-acw"/>
+                <constraint firstItem="C2z-tn-74c" firstAttribute="top" secondItem="e0X-Fm-9s1" secondAttribute="top" id="lPz-YA-JFP"/>
                 <constraint firstAttribute="bottom" secondItem="4fg-CE-2Ak" secondAttribute="bottom" id="pqX-yV-WBE"/>
                 <constraint firstItem="4fg-CE-2Ak" firstAttribute="top" secondItem="e0X-Fm-9s1" secondAttribute="top" id="wML-WM-5wk"/>
-                <constraint firstItem="C2z-tn-74c" firstAttribute="centerY" secondItem="e0X-Fm-9s1" secondAttribute="centerY" id="wtA-74-ZyN"/>
             </constraints>
             <point key="canvasLocation" x="101" y="330"/>
         </customView>
         <customView id="fNe-3E-tHx">
-            <rect key="frame" x="0.0" y="0.0" width="272" height="40"/>
+            <rect key="frame" x="0.0" y="0.0" width="272" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="iMW-Yw-Qr1" customClass="ComponentCColorGroup" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="4" width="200" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="200" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="200" id="SHA-2q-YHA"/>
-                        <constraint firstAttribute="height" constant="32" id="wEl-wE-Rqa"/>
+                        <constraint firstAttribute="height" constant="34" id="wEl-wE-Rqa"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="wQe-BH-R8L" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="240" y="4" width="32" height="32"/>
+                    <rect key="frame" x="240" y="0.0" width="32" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="9fU-Qk-ONC"/>
-                        <constraint firstAttribute="height" constant="32" id="ln7-TH-Obd"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="ALM-CP-Hsi" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="204" y="4" width="32" height="32"/>
+                    <rect key="frame" x="204" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="Bx5-Yq-cgP"/>
                         <constraint firstAttribute="width" constant="32" id="JE6-XM-w4P"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
-                <constraint firstAttribute="bottom" secondItem="iMW-Yw-Qr1" secondAttribute="bottom" constant="4" id="6ha-aC-hxy"/>
-                <constraint firstItem="iMW-Yw-Qr1" firstAttribute="top" secondItem="fNe-3E-tHx" secondAttribute="top" constant="4" id="975-XT-fiS"/>
-                <constraint firstItem="wQe-BH-R8L" firstAttribute="centerY" secondItem="fNe-3E-tHx" secondAttribute="centerY" id="R2y-su-bV9"/>
+                <constraint firstAttribute="bottom" secondItem="iMW-Yw-Qr1" secondAttribute="bottom" id="6ha-aC-hxy"/>
+                <constraint firstItem="iMW-Yw-Qr1" firstAttribute="top" secondItem="fNe-3E-tHx" secondAttribute="top" id="975-XT-fiS"/>
+                <constraint firstAttribute="bottom" secondItem="wQe-BH-R8L" secondAttribute="bottom" id="FEa-C3-N27"/>
+                <constraint firstAttribute="bottom" secondItem="ALM-CP-Hsi" secondAttribute="bottom" id="P91-fq-Wda"/>
+                <constraint firstItem="wQe-BH-R8L" firstAttribute="top" secondItem="fNe-3E-tHx" secondAttribute="top" id="WzN-UG-nBO"/>
                 <constraint firstItem="iMW-Yw-Qr1" firstAttribute="leading" secondItem="fNe-3E-tHx" secondAttribute="leading" id="gEj-Pt-8OL"/>
                 <constraint firstItem="wQe-BH-R8L" firstAttribute="leading" secondItem="ALM-CP-Hsi" secondAttribute="trailing" constant="4" id="hun-MS-DVm"/>
+                <constraint firstItem="ALM-CP-Hsi" firstAttribute="top" secondItem="fNe-3E-tHx" secondAttribute="top" id="irN-OH-H4H"/>
                 <constraint firstAttribute="trailing" secondItem="wQe-BH-R8L" secondAttribute="trailing" id="lhq-mL-Rvu"/>
                 <constraint firstItem="ALM-CP-Hsi" firstAttribute="leading" secondItem="iMW-Yw-Qr1" secondAttribute="trailing" constant="4" id="rdP-EY-2Ep"/>
-                <constraint firstItem="ALM-CP-Hsi" firstAttribute="centerY" secondItem="fNe-3E-tHx" secondAttribute="centerY" id="zJW-WX-BZs"/>
             </constraints>
             <point key="canvasLocation" x="89" y="418"/>
         </customView>
         <customView id="ppn-TH-8Io">
-            <rect key="frame" x="0.0" y="0.0" width="240" height="32"/>
+            <rect key="frame" x="0.0" y="0.0" width="240" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="B4D-FR-TIx" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="80" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="80" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="80" id="8TW-7S-GG9"/>
-                        <constraint firstAttribute="height" constant="32" id="ry6-EX-cdy"/>
+                        <constraint firstAttribute="height" constant="34" id="ry6-EX-cdy"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="JpI-5T-pBC" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="80" y="0.0" width="80" height="32"/>
+                    <rect key="frame" x="80" y="0.0" width="80" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="Qx1-fy-cVO"/>
                         <constraint firstAttribute="width" constant="80" id="hdb-ca-Oi3"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="KwU-gg-WMl" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="160" y="0.0" width="80" height="32"/>
+                    <rect key="frame" x="160" y="0.0" width="80" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="80" id="AQo-8z-B3b"/>
-                        <constraint firstAttribute="height" constant="32" id="KEx-5w-LVl"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
                 <constraint firstItem="B4D-FR-TIx" firstAttribute="leading" secondItem="ppn-TH-8Io" secondAttribute="leading" id="4ZF-jk-ExT"/>
                 <constraint firstAttribute="bottom" secondItem="B4D-FR-TIx" secondAttribute="bottom" id="7Ii-bM-XXV"/>
-                <constraint firstItem="JpI-5T-pBC" firstAttribute="centerY" secondItem="ppn-TH-8Io" secondAttribute="centerY" id="CYw-8P-957"/>
-                <constraint firstItem="KwU-gg-WMl" firstAttribute="centerY" secondItem="ppn-TH-8Io" secondAttribute="centerY" id="TJ1-wS-ZSk"/>
+                <constraint firstAttribute="bottom" secondItem="KwU-gg-WMl" secondAttribute="bottom" id="HO6-Vt-mUD"/>
+                <constraint firstItem="JpI-5T-pBC" firstAttribute="top" secondItem="ppn-TH-8Io" secondAttribute="top" id="HdW-Pg-Uoa"/>
+                <constraint firstAttribute="bottom" secondItem="JpI-5T-pBC" secondAttribute="bottom" id="Syo-Fd-B6T"/>
                 <constraint firstItem="B4D-FR-TIx" firstAttribute="top" secondItem="ppn-TH-8Io" secondAttribute="top" id="UGi-o4-gGw"/>
+                <constraint firstItem="KwU-gg-WMl" firstAttribute="top" secondItem="ppn-TH-8Io" secondAttribute="top" id="XJ6-Ea-b2E"/>
                 <constraint firstItem="JpI-5T-pBC" firstAttribute="leading" secondItem="B4D-FR-TIx" secondAttribute="trailing" id="lvv-CC-M45"/>
                 <constraint firstItem="KwU-gg-WMl" firstAttribute="leading" secondItem="JpI-5T-pBC" secondAttribute="trailing" id="qef-1x-sVI"/>
                 <constraint firstAttribute="trailing" secondItem="KwU-gg-WMl" secondAttribute="trailing" id="rwE-Be-Mm8"/>
@@ -297,18 +297,18 @@
             <point key="canvasLocation" x="73" y="528"/>
         </customView>
         <customView id="LQy-CR-O3V">
-            <rect key="frame" x="0.0" y="0.0" width="216" height="32"/>
+            <rect key="frame" x="0.0" y="0.0" width="216" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="1N7-B1-3Nx" customClass="ComponentInput" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="106" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="106" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="106" id="Ooy-kn-c06"/>
-                        <constraint firstAttribute="height" constant="32" id="Vuy-Wu-IJq"/>
+                        <constraint firstAttribute="height" constant="34" id="Vuy-Wu-IJq"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="64L-ht-BB8" customClass="ComponentInput" customModule="KMComponentLibrary">
-                    <rect key="frame" x="110" y="0.0" width="106" height="32"/>
+                    <rect key="frame" x="110" y="0.0" width="106" height="34"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="106" id="SQx-rC-VkJ"/>
                     </constraints>
@@ -325,14 +325,14 @@
             </constraints>
             <point key="canvasLocation" x="73" y="754"/>
         </customView>
-        <customView id="oSY-rJ-702">
-            <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+        <customView misplaced="YES" id="oSY-rJ-702">
+            <rect key="frame" x="0.0" y="0.0" width="32" height="34"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="0t5-jg-ujy" customClass="ComponentButton" customModule="KMComponentLibrary">
-                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                    <rect key="frame" x="0.0" y="0.0" width="32" height="34"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="vK0-HX-YKH"/>
+                        <constraint firstAttribute="height" constant="34" id="vK0-HX-YKH"/>
                         <constraint firstAttribute="width" constant="32" id="veC-00-4pN"/>
                     </constraints>
                 </customView>

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -1206,9 +1206,6 @@
 		9FD0D2AF2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */; };
 		9FD0D2B02AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */; };
 		9FD0D2B12AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */; };
-		9FD0D2B32AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2B22AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift */; };
-		9FD0D2B42AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2B22AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift */; };
-		9FD0D2B52AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2B22AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift */; };
 		9FD0FA3129CD947000F2AB0D /* KMOpacityPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0FA2F29CD947000F2AB0D /* KMOpacityPanel.swift */; };
 		9FD0FA3229CD947000F2AB0D /* KMOpacityPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0FA2F29CD947000F2AB0D /* KMOpacityPanel.swift */; };
 		9FD0FA3329CD947000F2AB0D /* KMOpacityPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0FA2F29CD947000F2AB0D /* KMOpacityPanel.swift */; };
@@ -5387,9 +5384,6 @@
 		F352428E2CCB768B0000A901 /* KMNFileAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = F352428C2CCB768B0000A901 /* KMNFileAttribute.swift */; };
 		F352428F2CCB768B0000A901 /* KMNFileAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = F352428C2CCB768B0000A901 /* KMNFileAttribute.swift */; };
 		F35242902CCB768B0000A901 /* KMNFileAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = F352428C2CCB768B0000A901 /* KMNFileAttribute.swift */; };
-		F356720829AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F356720429AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib */; };
-		F356720929AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F356720429AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib */; };
-		F356720A29AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F356720429AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib */; };
 		F359916929261F0D000D25DE /* CPDFListView+Tool.m in Sources */ = {isa = PBXBuildFile; fileRef = F359916829261F0D000D25DE /* CPDFListView+Tool.m */; };
 		F359916A29261F0E000D25DE /* CPDFListView+Tool.m in Sources */ = {isa = PBXBuildFile; fileRef = F359916829261F0D000D25DE /* CPDFListView+Tool.m */; };
 		F359916B29261F0E000D25DE /* CPDFListView+Tool.m in Sources */ = {isa = PBXBuildFile; fileRef = F359916829261F0D000D25DE /* CPDFListView+Tool.m */; };
@@ -6146,7 +6140,6 @@
 		9FD0D2A62AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSavePanelAccessoryController.swift; sourceTree = "<group>"; };
 		9FD0D2AA2AD5143D00DA3FF8 /* KMTableRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMTableRowView.swift; sourceTree = "<group>"; };
 		9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPDFListEditAnnotationViewController.swift; sourceTree = "<group>"; };
-		9FD0D2B22AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPDFListAnnotationNoteWindowController.swift; sourceTree = "<group>"; };
 		9FD0FA2F29CD947000F2AB0D /* KMOpacityPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMOpacityPanel.swift; sourceTree = "<group>"; };
 		9FD0FA3029CD947000F2AB0D /* KMOpacityPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMOpacityPanel.xib; sourceTree = "<group>"; };
 		9FD0FA4929D43D6800F2AB0D /* KMDeviceBrowserWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMDeviceBrowserWindowController.swift; sourceTree = "<group>"; };
@@ -7834,7 +7827,6 @@
 		F34BF93329530708002C25A2 /* NSImage+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSImage+PDFListView.h"; sourceTree = "<group>"; };
 		F34BF93429530708002C25A2 /* NSImage+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSImage+PDFListView.m"; sourceTree = "<group>"; };
 		F352428C2CCB768B0000A901 /* KMNFileAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMNFileAttribute.swift; sourceTree = "<group>"; };
-		F356720429AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CPDFListAnnotationNoteWindowController.xib; sourceTree = "<group>"; };
 		F359916729261F0D000D25DE /* CPDFListView+Tool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CPDFListView+Tool.h"; sourceTree = "<group>"; };
 		F359916829261F0D000D25DE /* CPDFListView+Tool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CPDFListView+Tool.m"; sourceTree = "<group>"; wrapsLines = 0; };
 		F3599171292B62F5000D25DE /* CStringConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CStringConstants.h; sourceTree = "<group>"; };
@@ -14544,8 +14536,6 @@
 				F3599217292CA27A000D25DE /* CPDFListViewRuntime.m */,
 				9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */,
 				F3A9DC7D294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib */,
-				9FD0D2B22AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift */,
-				F356720429AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib */,
 				9F53D5462AD664C300CCF9D8 /* CPDFListHoverAnnotationViewController.swift */,
 				F3B7DF992948565000333201 /* CPDFListHoverAnnotationViewController.xib */,
 				9FCFEC672AC2EAD500EAD2CB /* CPDFListViewColorMenuItemView.swift */,
@@ -15438,7 +15428,6 @@
 				BB1B0B012B4FC6E900889528 /* KMConvertGuideView.xib in Resources */,
 				BBAC26A82AFE138800563A08 /* KMToolbarItemPopViewController.xib in Resources */,
 				BBE0689D2CDDF137000512BC /* KMBatesTemplateController.xib in Resources */,
-				F356720829AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib in Resources */,
 				BBE788F02CBD2464008086E2 /* ModalVC.xib in Resources */,
 				9F94747F29FA24200042F949 /* Credits.rtf in Resources */,
 				89316825296D73CC0073EA59 /* KMSignatureAnnotationViewController.xib in Resources */,
@@ -16011,7 +16000,6 @@
 				BB5A9D342CB6520100F64C1F /* home.xcassets in Resources */,
 				BBB3769F2B10A7FD009539CC /* a_4a.png in Resources */,
 				BBF811E52B0717970074874F /* KMExtractImageWindowController.xib in Resources */,
-				F356720929AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib in Resources */,
 				BBB789B52BE8BF2400F7E09C /* AIChatStringUploadItem.xib in Resources */,
 				ADDF838D2B391A5D00A81A4E /* DSignatureFileListCellView.xib in Resources */,
 				9FDD0FA32952FF4D000C4DAD /* $themes.json in Resources */,
@@ -16569,7 +16557,6 @@
 				BBE7890D2CBD2464008086E2 /* TooltipVC.xib in Resources */,
 				9F56648C2988B16F00020985 /* KMTextfieldVC.xib in Resources */,
 				9FA607E328FD4C9F00B46586 /* KMHomePopViewController.xib in Resources */,
-				F356720A29AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib in Resources */,
 				BBC5ABDC2D01C411008BA0CB /* KMSignatureListController.xib in Resources */,
 				BB8AA53D2CC65C900084F183 /* KMNAlignmentController.xib in Resources */,
 				658FDBB72C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.xib in Resources */,
@@ -17641,7 +17628,6 @@
 				BBD8EE932B8EC86A00EB05FE /* AutoSaveFileItem.m in Sources */,
 				AD3AAD232B0B6F9E00DE5FE7 /* KMCompareContentView.swift in Sources */,
 				651675CA2CE3312000019A20 /* KMTocTableCellView.swift in Sources */,
-				9FD0D2B32AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift in Sources */,
 				BB74DA7F2AC42959006EDFE7 /* NSButton+KMExtension.swift in Sources */,
 				BB6D2DAB2B674D7900624C24 /* CPDFPage+KMExtension.swift in Sources */,
 				AD07BCB22D02CBB20075054B /* KMCompressSettingModel.swift in Sources */,
@@ -18271,7 +18257,6 @@
 				BB9599C42B31647B0062D346 /* KMRedactPropertiesWindowController.swift in Sources */,
 				BB99ACD0292E2AEF0048AFD9 /* KMMergeCollectionViewItem.swift in Sources */,
 				BBE788B82CBD2463008086E2 /* PaginationVC.swift in Sources */,
-				9FD0D2B42AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift in Sources */,
 				9F3D819429A33A290087B5AD /* KMDesignDropdown.swift in Sources */,
 				9F0CB4802967F64D00007028 /* KMPropertiesPanelReadOnlySubVC.swift in Sources */,
 				F321C1F72CD9F0DD009982C8 /* KMSecureTextFiled.swift in Sources */,
@@ -20482,7 +20467,6 @@
 				BB5EC3642C2BDC9D0090EF27 /* KMTextAlignmentController.swift in Sources */,
 				9FF94F1B29A770B500B1EF69 /* KMFillSignShapePanel.swift in Sources */,
 				BBA5429E29F13A140041BAD0 /* KMMemorandumPattern.swift in Sources */,
-				9FD0D2B52AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift in Sources */,
 				F359916B29261F0E000D25DE /* CPDFListView+Tool.m in Sources */,
 				BB8810C02B4F872500AFA63E /* KMVerificationWindowController.m in Sources */,
 				BB183DDF2B4EBE1B00F99C7E /* KMTrialSuccessController.swift in Sources */,