【2025】【综合】工具栏方法调整

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -3768,6 +3768,7 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
             }
             self.refreshToolbarRightViewInfo()
             
+            toolbarViewModeChanged()
         } else if toolbarManager.getSubToolItemIdentifys(KMPDFToolbar_Edit_Identifier).contains(itemIdentifier) {
             //MARK: -编辑
             if itemIdentifier == KMPDFToolbar_edit_addWatermark_Identifier {
@@ -3805,6 +3806,15 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
             } else if itemIdentifier == KMPDFToolbar_edit_crop_Identifier {
                 showCropController()
             }
+            
+            if viewManager.subToolMode == .None {
+                viewManager.showRightSide = false
+            } else {
+                viewManager.showRightSide = true
+            }
+            self.refreshToolbarRightViewInfo()
+            
+            toolbarViewModeChanged()
         } else if toolbarManager.getSubToolItemIdentifys(KMPDFToolbar_Form_Identifier).contains(itemIdentifier) {
             //MARK: -Form表单
             if itemIdentifier == KMPDFToolbar_form_HighlightFields_Identifier {
@@ -3841,9 +3851,26 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
             } else if itemIdentifier == KMPDFToolbar_form_Distribute_Hori_Identifier {
                 listView.change(listView.activeAnnotations as? [CPDFAnnotation], alignmentType: .disHorizontally)
             }
+            
+            if viewManager.subToolMode == .None {
+                viewManager.showRightSide = false
+            } else {
+                viewManager.showRightSide = true
+            }
+            self.refreshToolbarRightViewInfo()
+            
+            toolbarViewModeChanged()
         } else if toolbarManager.getSubToolItemIdentifys(KMPDFToolbar_Fill_Identifier).contains(itemIdentifier) {
             //MARK: -填充
             
+            if viewManager.subToolMode == .None {
+                viewManager.showRightSide = false
+            } else {
+                viewManager.showRightSide = true
+            }
+            self.refreshToolbarRightViewInfo()
+            
+            toolbarViewModeChanged()
         } else if toolbarManager.getSubToolItemIdentifys(KMPDFToolbar_Convert_Identifier).contains(itemIdentifier) {
             //MARK: -转档
             if itemIdentifier == KMPDFToolbar_convert_word_Identifier {
@@ -3877,6 +3904,9 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
                 NSApplication.ShowImageToPDFWindow()
                 
             }
+            self.refreshToolbarRightViewInfo()
+            
+            toolbarViewModeChanged()
         } else if toolbarManager.getSubToolItemIdentifys(KMPDFToolbar_Protect_Identifier).contains(itemIdentifier) {
             //MARK: -Protect
             if itemIdentifier == KMPDFToolbar_protect_redact_Identifier {
@@ -3931,6 +3961,15 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
             } else if itemIdentifier == KMPDFToolbar_tools_batch_Identifier {
                 self.showBatchWindow(type: .convertPDF, files: [self.listView.document.documentURL])
             }
+            
+            if viewManager.subToolMode == .None {
+                viewManager.showRightSide = false
+            } else {
+                viewManager.showRightSide = true
+            }
+            self.refreshToolbarRightViewInfo()
+             
+            toolbarViewModeChanged()
         } else if itemIdentifier == KMPDFToolbar_ViewDisplay_Identifier {
             //MARK: -Display
             updatePDFDisplaySettingView()
@@ -3993,7 +4032,6 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
         
         refreshToolbarViewHeightInfo()
         
-        toolbarViewModeChanged()
         
         refreshRightSide()