Browse Source

【2025】【页面编辑】双击退出页面编辑UI刷新

dinglingui 4 months ago
parent
commit
cad7d130ed

+ 2 - 3
PDF Office/PDF Master/KMClass/KMPDFViewController/KMPDFViewController.swift

@@ -140,7 +140,6 @@ class KMPDFViewController: NSViewController {
             pageEditViewController?.thumbnailBaseViewDelegate = self
             pageEditViewController?.view.autoresizingMask = [.width,.height]
         }
-        KMPDFManager.manager.isPageEditMode = true
     }
     
     func exitPageEditMode() {
@@ -148,8 +147,6 @@ class KMPDFViewController: NSViewController {
             pageEditViewController?.view.removeFromSuperview()
             pageEditViewController = nil
         }
-        KMPDFManager.manager.isPageEditMode = false
-
     }
     
 }
@@ -210,6 +207,8 @@ extension KMPDFViewController: CPDFListViewDelegate {
 extension KMPDFViewController: KMNThumbnailBaseViewDelegate {
     func clickThumbnailViewControlle(pageEditVC:KMNThumbnailBaseViewController?,currentIndex:Int)  {
         exitPageEditMode()
+        KMPDFManager.manager.isPageEditMode = false
+        pdfToolbarController?.reloadPageEditView()
     }
 }
     

+ 39 - 23
PDF Office/PDF Master/KMClass/KMPDFViewController/KMPDFViewController.xib

@@ -1,13 +1,14 @@
 <?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>
         <customObject id="-2" userLabel="File's Owner" customClass="KMPDFViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
+                <outlet property="bottomContendBox" destination="isu-zV-1ye" id="fO3-eh-xZO"/>
                 <outlet property="contendBox" destination="FZ3-iP-mWF" id="tKx-ka-Lmh"/>
                 <outlet property="infoContendBox" destination="OmV-3U-dxA" id="jtI-O3-Q6L"/>
                 <outlet property="sidebarBox" destination="Unz-BN-IQn" id="xjc-HF-cr5"/>
@@ -38,34 +39,49 @@
                                     <constraint firstAttribute="height" constant="80" id="clt-Pv-dvZ"/>
                                 </constraints>
                             </box>
-                            <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Unz-BN-IQn">
-                                <rect key="frame" x="0.0" y="0.0" width="44" height="367"/>
-                                <view key="contentView" id="RtQ-dH-XUA">
-                                    <rect key="frame" x="1" y="1" width="42" height="365"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                </view>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="44" id="unN-Gd-R0c"/>
-                                </constraints>
-                            </box>
-                            <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="OmV-3U-dxA">
-                                <rect key="frame" x="44" y="0.0" width="661" height="367"/>
-                                <view key="contentView" id="qHs-qF-D1g">
-                                    <rect key="frame" x="1" y="1" width="659" height="365"/>
+                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="isu-zV-1ye">
+                                <rect key="frame" x="0.0" y="0.0" width="705" height="367"/>
+                                <view key="contentView" id="b6b-kg-L7X">
+                                    <rect key="frame" x="0.0" y="0.0" width="705" height="367"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Unz-BN-IQn">
+                                            <rect key="frame" x="0.0" y="0.0" width="44" height="367"/>
+                                            <view key="contentView" id="RtQ-dH-XUA">
+                                                <rect key="frame" x="1" y="1" width="42" height="365"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            </view>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="44" id="unN-Gd-R0c"/>
+                                            </constraints>
+                                        </box>
+                                        <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="OmV-3U-dxA">
+                                            <rect key="frame" x="44" y="0.0" width="661" height="367"/>
+                                            <view key="contentView" id="qHs-qF-D1g">
+                                                <rect key="frame" x="1" y="1" width="659" height="365"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            </view>
+                                        </box>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="Unz-BN-IQn" firstAttribute="leading" secondItem="b6b-kg-L7X" secondAttribute="leading" id="08L-tV-X5F"/>
+                                        <constraint firstAttribute="trailing" secondItem="OmV-3U-dxA" secondAttribute="trailing" id="7L4-ZT-bBR"/>
+                                        <constraint firstItem="OmV-3U-dxA" firstAttribute="top" secondItem="b6b-kg-L7X" secondAttribute="top" id="DsJ-zi-LL2"/>
+                                        <constraint firstAttribute="bottom" secondItem="Unz-BN-IQn" secondAttribute="bottom" id="Dvh-O0-mUp"/>
+                                        <constraint firstItem="OmV-3U-dxA" firstAttribute="leading" secondItem="Unz-BN-IQn" secondAttribute="trailing" id="KHw-is-uNT"/>
+                                        <constraint firstItem="Unz-BN-IQn" firstAttribute="top" secondItem="b6b-kg-L7X" secondAttribute="top" id="nhP-Ix-zLc"/>
+                                        <constraint firstAttribute="bottom" secondItem="OmV-3U-dxA" secondAttribute="bottom" id="t6n-hh-SgN"/>
+                                    </constraints>
                                 </view>
                             </box>
                         </subviews>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="XM0-kh-Qw0" secondAttribute="trailing" id="8at-qx-1OZ"/>
-                            <constraint firstItem="Unz-BN-IQn" firstAttribute="top" secondItem="XM0-kh-Qw0" secondAttribute="bottom" id="F4Y-mu-Fxa"/>
-                            <constraint firstItem="OmV-3U-dxA" firstAttribute="leading" secondItem="Unz-BN-IQn" secondAttribute="trailing" id="HU4-E0-LmO"/>
-                            <constraint firstItem="Unz-BN-IQn" firstAttribute="leading" secondItem="n2K-0V-rUW" secondAttribute="leading" id="LGc-DI-Yfb"/>
-                            <constraint firstAttribute="bottom" secondItem="Unz-BN-IQn" secondAttribute="bottom" id="Xg8-2R-UxK"/>
-                            <constraint firstAttribute="bottom" secondItem="OmV-3U-dxA" secondAttribute="bottom" id="h6E-WQ-OSB"/>
-                            <constraint firstItem="OmV-3U-dxA" firstAttribute="top" secondItem="XM0-kh-Qw0" secondAttribute="bottom" id="n3E-8X-KyK"/>
+                            <constraint firstItem="isu-zV-1ye" firstAttribute="top" secondItem="XM0-kh-Qw0" secondAttribute="bottom" id="DEB-BW-shm"/>
+                            <constraint firstItem="isu-zV-1ye" firstAttribute="leading" secondItem="n2K-0V-rUW" secondAttribute="leading" id="Xw1-AG-o69"/>
+                            <constraint firstAttribute="trailing" secondItem="isu-zV-1ye" secondAttribute="trailing" id="ctF-1p-knO"/>
+                            <constraint firstAttribute="bottom" secondItem="isu-zV-1ye" secondAttribute="bottom" id="nOO-iA-Yuo"/>
                             <constraint firstItem="XM0-kh-Qw0" firstAttribute="top" secondItem="n2K-0V-rUW" secondAttribute="top" id="oIT-rX-gxv"/>
-                            <constraint firstAttribute="trailing" secondItem="OmV-3U-dxA" secondAttribute="trailing" id="sNI-ra-n4b"/>
                             <constraint firstItem="XM0-kh-Qw0" firstAttribute="leading" secondItem="n2K-0V-rUW" secondAttribute="leading" id="wHL-co-BSL"/>
                         </constraints>
                     </view>