【2025】【PDFView】 pop框UI调整

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

@@ -29,7 +29,7 @@ class KMNPopAnnotationWindowController: KMNBaseWindowController {
     
     public var popType:ListViewPopType = .popTypeNone {
         didSet {
-            rightOffsetConstraint.constant = 45.0
+            rightOffsetConstraint.constant = 49.0
             operationHeightConstraint.constant = 32.0
             paneBox.isHidden = false
             

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

@@ -47,6 +47,7 @@
                 <outlet property="paneSelectorItem" destination="pfZ-VY-VTh" id="0hz-zY-KKP"/>
                 <outlet property="rightOffsetConstraint" destination="TYz-c7-EYo" id="3jY-WY-4JO"/>
                 <outlet property="shapeColorGroup" destination="iMW-Yw-Qr1" id="KTl-HV-r0w"/>
+                <outlet property="shapeRightConstraint" destination="rdP-EY-2Ep" id="4eb-Rk-UiB"/>
                 <outlet property="shapeView" destination="fNe-3E-tHx" id="peC-YT-RFb"/>
                 <outlet property="urlInput" destination="uD5-qC-LES" id="EFf-gb-5Kp"/>
                 <outlet property="urlLinkButton" destination="JpI-5T-pBC" id="M2D-dd-ufE"/>
@@ -62,15 +63,15 @@
             <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"/>
+            <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="511" height="42"/>
+                <rect key="frame" x="0.0" y="0.0" width="501" height="40"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="iV9-GQ-NJE">
-                        <rect key="frame" x="0.0" y="0.0" width="503" height="42"/>
+                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="iV9-GQ-NJE">
+                        <rect key="frame" x="0.0" y="0.0" width="501" height="40"/>
                         <view key="contentView" id="9j5-uh-fjw">
-                            <rect key="frame" x="1" y="1" width="501" height="40"/>
+                            <rect key="frame" x="0.0" y="0.0" width="501" height="40"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="hK7-nm-yiB">
@@ -85,19 +86,19 @@
                                     </constraints>
                                 </box>
                                 <box boxType="custom" borderType="none" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="34L-Tp-WUP">
-                                    <rect key="frame" x="456" y="3" width="37" height="34"/>
+                                    <rect key="frame" x="452" y="3" width="41" height="34"/>
                                     <view key="contentView" id="PYw-kY-DK4">
-                                        <rect key="frame" x="0.0" y="0.0" width="37" height="34"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="41" height="34"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="pfZ-VY-VTh" customClass="ComponentCSelector" customModule="KMComponentLibrary">
-                                                <rect key="frame" x="5" y="0.0" width="32" height="34"/>
+                                                <rect key="frame" x="9" y="0.0" width="32" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="32" id="NAx-PC-y22"/>
                                                 </constraints>
                                             </customView>
                                             <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="9xa-JY-EhU">
-                                                <rect key="frame" x="0.0" y="9" width="1" height="16"/>
+                                                <rect key="frame" x="4" y="9" width="1" height="16"/>
                                                 <view key="contentView" id="QmK-oA-Zno">
                                                     <rect key="frame" x="0.0" y="0.0" width="1" height="16"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -111,7 +112,7 @@
                                         </subviews>
                                         <constraints>
                                             <constraint firstItem="pfZ-VY-VTh" firstAttribute="leading" secondItem="9xa-JY-EhU" secondAttribute="trailing" constant="4" id="3Sg-wz-EGj"/>
-                                            <constraint firstItem="9xa-JY-EhU" firstAttribute="leading" secondItem="PYw-kY-DK4" secondAttribute="leading" id="AMb-Wj-EcT"/>
+                                            <constraint firstItem="9xa-JY-EhU" firstAttribute="leading" secondItem="PYw-kY-DK4" secondAttribute="leading" constant="4" id="AMb-Wj-EcT"/>
                                             <constraint firstItem="9xa-JY-EhU" firstAttribute="centerY" secondItem="PYw-kY-DK4" secondAttribute="centerY" id="Dyx-bM-HEA"/>
                                             <constraint firstAttribute="trailing" secondItem="pfZ-VY-VTh" secondAttribute="trailing" id="S3H-Jd-e8p"/>
                                             <constraint firstAttribute="bottom" secondItem="pfZ-VY-VTh" secondAttribute="bottom" id="cwN-Ux-8ga"/>
@@ -254,7 +255,7 @@
                 <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 firstAttribute="trailing" secondItem="iMW-Yw-Qr1" secondAttribute="trailing" constant="72" id="rdP-EY-2Ep"/>
             </constraints>
             <point key="canvasLocation" x="89" y="418"/>
         </customView>

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

@@ -12,7 +12,7 @@ import KMComponentLibrary
 class KMNPopContentEditWindowController: KMNBaseWindowController {
     public var editType:EditContentPopType = .editNone {
         didSet {
-            rightOffsetConstraint.constant = 45.0
+            rightOffsetConstraint.constant = 49.0
             paneBox.isHidden = false
             
             switch editType {

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

@@ -48,15 +48,15 @@
             <windowStyleMask key="styleMask" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="480" height="270"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="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"/>
+                <rect key="frame" x="0.0" y="0.0" width="520" height="40"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="elC-AN-sp7">
-                        <rect key="frame" x="0.0" y="0.0" width="522" height="42"/>
+                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="elC-AN-sp7">
+                        <rect key="frame" x="0.0" y="0.0" width="520" height="40"/>
                         <view key="contentView" id="vS3-lN-nYx">
-                            <rect key="frame" x="1" y="1" width="520" height="40"/>
+                            <rect key="frame" x="0.0" y="0.0" width="520" height="40"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="gcY-AN-rME">
@@ -71,19 +71,19 @@
                                     </constraints>
                                 </box>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Asu-CO-giT">
-                                    <rect key="frame" x="475" y="3" width="37" height="34"/>
+                                    <rect key="frame" x="471" y="3" width="41" height="34"/>
                                     <view key="contentView" id="IEM-hp-v4T">
-                                        <rect key="frame" x="0.0" y="0.0" width="37" height="34"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="41" height="34"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="2aI-ns-oxB" customClass="ComponentCSelectorItem" customModule="KMComponentLibrary">
-                                                <rect key="frame" x="5" y="0.0" width="32" height="34"/>
+                                                <rect key="frame" x="9" y="0.0" width="32" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="32" id="Ige-a8-PP9"/>
                                                 </constraints>
                                             </customView>
                                             <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Rsf-Ge-bao">
-                                                <rect key="frame" x="0.0" y="9" width="1" height="16"/>
+                                                <rect key="frame" x="4" y="9" width="1" height="16"/>
                                                 <view key="contentView" id="MHM-uo-o2D">
                                                     <rect key="frame" x="0.0" y="0.0" width="1" height="16"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -101,7 +101,7 @@
                                             <constraint firstAttribute="bottom" secondItem="2aI-ns-oxB" secondAttribute="bottom" id="YBG-JT-o51"/>
                                             <constraint firstItem="2aI-ns-oxB" firstAttribute="top" secondItem="IEM-hp-v4T" secondAttribute="top" id="a9M-Wb-Ogd"/>
                                             <constraint firstItem="Rsf-Ge-bao" firstAttribute="centerY" secondItem="IEM-hp-v4T" secondAttribute="centerY" id="sA4-Ga-cV6"/>
-                                            <constraint firstItem="Rsf-Ge-bao" firstAttribute="leading" secondItem="IEM-hp-v4T" secondAttribute="leading" id="ufx-CP-u5S"/>
+                                            <constraint firstItem="Rsf-Ge-bao" firstAttribute="leading" secondItem="IEM-hp-v4T" secondAttribute="leading" constant="4" id="ufx-CP-u5S"/>
                                         </constraints>
                                     </view>
                                 </box>

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

@@ -1,8 +1,8 @@
 <?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">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -31,15 +31,15 @@
             <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"/>
-            <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="470" 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="468" height="40"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="yhB-Bi-Ro3">
-                        <rect key="frame" x="0.0" y="0.0" width="470" height="42"/>
+                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="yhB-Bi-Ro3">
+                        <rect key="frame" x="0.0" y="0.0" width="468" height="40"/>
                         <view key="contentView" id="DQm-Zl-I4t">
-                            <rect key="frame" x="1" y="1" width="468" height="40"/>
+                            <rect key="frame" x="0.0" y="0.0" width="468" height="40"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="5OK-yK-3wT">