Ver Fonte

【文字图片编辑】切换类型右侧菜单栏没有消失修复

lizhe há 1 ano atrás
pai
commit
82efed780a

+ 1 - 0
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.h

@@ -61,6 +61,7 @@ typedef NS_ENUM(NSInteger, CAnnotationType) {
     /*CAnnotationTypeMovie,*/
     CAnnotationTypeRedact,
     CAnnotationTypeEraser,
+    CAnnotationTypeEditTextImage,
     CAnnotationTypeAddText,
     CAnnotationTypeAddImage,
     

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -2078,7 +2078,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 self.listView.isHidden = true //不影藏的话会出现鼠标事件的崩溃
             }
         } else if type == .editPDF {
-            
+            self.listView.annotationType = .editTextImage
         }
     }
     

+ 4 - 1
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift

@@ -84,6 +84,9 @@ extension KMMainViewController: KMToolbarControllerDelegate {
             self.heightOffset.constant = CGFloat(heightOffset)
         }
         self.refreshListViewToolMode()
+        if self.listView.annotationType == .editTextImage {
+            self.closeRightPane()
+        }
         self.listView.annotationType = .unkown
 //        self.rightSideViewController.view.isHidden = true
 //        self.rightSideViewController.isHidden = true
@@ -216,7 +219,7 @@ extension KMMainViewController: KMToolbarControllerDelegate {
             self.listView.toolMode = .selfSignMode
             self.rightSideViewController.subViewType = .AnnotationProperts
         } else if self.toolbarController.toolbarType == .editPDF {
-            self.listView.toolMode = .editPDFToolMode
+            self.listView.toolMode = .editPDFToolMode 
 //            self.listView.editingConfig().isShowEditingAreaHover = true
 //            self.listView.editingConfig().editingBorderWidth = 1
 //            self.listView.editingConfig().editingCenterRadius = 5