Browse Source

【fix】【内容编辑】多选图片,属性面板,裁剪按钮有置灰但未禁用 提Bug

tangchao 8 months ago
parent
commit
0b3b82e610

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/EditPDF/KMImageNameEditPDFCropDisabled.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Icon 1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 102 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/EditPDF/KMImageNameEditPDFCropDisabled.imageset/Icon 1.pdf

@@ -0,0 +1,102 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 8.500000 8.500000 cm
+0.494118 0.498039 0.521569 scn
+2.642857 3.273844 m
+2.642857 12.357143 l
+6.428598 12.357143 l
+9.642898 12.357143 l
+11.250048 12.357143 l
+11.250048 13.357143 l
+9.642898 13.357143 l
+6.428598 13.357143 l
+2.642857 13.357143 l
+2.642857 15.000000 l
+1.642857 15.000000 l
+1.642857 13.357143 l
+0.000000 13.357143 l
+0.000000 12.357143 l
+1.642857 12.357143 l
+1.642857 2.142805 l
+1.642857 1.642805 l
+2.142857 1.642805 l
+12.357197 1.642805 l
+12.357197 -0.000051 l
+13.357197 -0.000051 l
+13.357197 1.642805 l
+15.000053 1.642805 l
+15.000053 2.642805 l
+13.357197 2.642805 l
+13.357197 6.428545 l
+13.357197 9.642844 l
+13.357197 11.249993 l
+12.357197 11.249993 l
+12.357197 9.642844 l
+12.357197 6.428545 l
+12.357197 2.642805 l
+3.426032 2.642805 l
+14.357984 13.574757 l
+13.650876 14.281863 l
+2.642857 3.273844 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  886
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 32.000000 32.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000976 00000 n
+0000000998 00000 n
+0000001171 00000 n
+0000001245 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1304
+%%EOF

+ 102 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/EditPDF/KMImageNameEditPDFCropDisabled.imageset/Icon.pdf

@@ -0,0 +1,102 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 8.500000 8.500000 cm
+0.854870 0.858652 0.870000 scn
+2.642857 3.273844 m
+2.642857 12.357143 l
+6.428598 12.357143 l
+9.642898 12.357143 l
+11.250048 12.357143 l
+11.250048 13.357143 l
+9.642898 13.357143 l
+6.428598 13.357143 l
+2.642857 13.357143 l
+2.642857 15.000000 l
+1.642857 15.000000 l
+1.642857 13.357143 l
+0.000000 13.357143 l
+0.000000 12.357143 l
+1.642857 12.357143 l
+1.642857 2.142805 l
+1.642857 1.642805 l
+2.142857 1.642805 l
+12.357197 1.642805 l
+12.357197 -0.000051 l
+13.357197 -0.000051 l
+13.357197 1.642805 l
+15.000053 1.642805 l
+15.000053 2.642805 l
+13.357197 2.642805 l
+13.357197 6.428545 l
+13.357197 9.642844 l
+13.357197 11.249993 l
+12.357197 11.249993 l
+12.357197 9.642844 l
+12.357197 6.428545 l
+12.357197 2.642805 l
+3.426032 2.642805 l
+14.357984 13.574757 l
+13.650876 14.281863 l
+2.642857 3.273844 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  886
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 32.000000 32.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000976 00000 n
+0000000998 00000 n
+0000001171 00000 n
+0000001245 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1304
+%%EOF

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/EditPDF/Controller/KMEditPDFPopToolBarController.swift

@@ -293,7 +293,6 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
         viewC.background_disabled = .clear
         viewC.borderColor_disabled = .clear
         
-        
         if itemKey == .fontAdd {
             viewC.image = NSImage(named: "KMImageNameEditPDFFontAdd")!
             viewC.image_disabled = NSImage(named: "KMImageNameEditPDFFontAddDisabled")!
@@ -329,6 +328,7 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             colorView.popToolTip = NSLocalizedString("Flip vertical", comment: "")
         } else if itemKey == .crop {
             viewC.image = NSImage(named: "KMImageNameEditPDFCrop")!
+            viewC.image_disabled = NSImage(named: "KMImageNameEditPDFCropDisabled")!
             colorView.popToolTip = NSLocalizedString("Crop", comment: "")
         } else if itemKey == .replace {
             viewC.image = NSImage(named: "KMImageNameEditPDFReplace")!

+ 4 - 1
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift

@@ -783,7 +783,10 @@ extension KMEditImagePropertyViewController {
     }
     
     @IBAction func cutImageAction(_ sender: Any) {
-        // selectImageAreas
+        let state = self.cropVC?.state ?? .None
+        if state == .Disabled {
+            return
+        }
         self.handdler?.cropAction()
     }