【综合】页面显示 退出页面显示后，右侧面板仍然显示的问题(已修复)

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -309,6 +309,8 @@ class KMToolbarController: NSViewController {
                     identifier == KMToolbarSelectToolModeItemIdentifier ||
                     identifier == KMToolbarZoomToSelectionItemIdentifier) {
                     self.childToolBarView?.leftControllButtonAction(item: item!.clickButton)
+                } else if identifier == KMToolbarViewSettingIdentifier {
+                    self.childToolBarView?.itemAction(item!)
                 } else {
                     self.childToolBarView?.changeAnnotationMode(item: item!.clickButton)
                 }
@@ -789,9 +791,6 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
     }
     
     func toolbarViewController(_ viewController: KMToolbarViewController, itemDidClick toolbarItem: KMToolbarItemView) {
-        if toolbarItem.itemIdentifier == KMDocumentViewDisplayToolbarItemIdentifier {
-            self.toolbarType = .viewSetting
-        }
         self.delegate?.toolbarViewController?(viewController, itemDidClick: toolbarItem)
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/PublicKey.swift

@@ -206,6 +206,9 @@ public func parentIdentifier(_ identifier: String) -> String {
     if (fillSignToolIdentifiers.contains(identifier)) {
         return KMDocumentFillSginToolbarItemIdentifier
     }
+    if KMViewDisplayIdentifiers.contains(identifier) {
+        return KMDocumentViewDisplayToolbarItemIdentifier
+    }
     return ""
 }
 

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

@@ -4211,10 +4211,10 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 } else if toolbarItem.itemIdentifier == KMDocumentNextPageToolbarItemIdentifier {
                     self.changePDFViewGotoNextPageAction()
                 } else if toolbarItem.itemIdentifier == KMDocumentViewDisplayToolbarItemIdentifier {
-//                    Swift.debugPrint("KMDocumentViewDisplayToolbarItemIdentifier ...")
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                        self.toolbarController.clickItem(KMToolbarViewSettingIdentifier)
-                    }
+                    let isSelected = toolbarItem.isSelected
+                    self.toolbarController.toolbarType = isSelected ? .None : .viewSetting
+                    toolbarItem.isSelected = !isSelected
+                    self.toolbarController.clickItem(KMToolbarViewSettingIdentifier)
                 } else if toolbarItem.itemIdentifier == KMLeftControlToolbarItemIdentifier {
                     toolbarItem.isSelected = !toolbarItem.isSelected
                     self.toggleLeftPane()
@@ -4251,15 +4251,14 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     }
                     self.km_beginSheet(windowC: windowC)
                 } else if toolbarItem.itemIdentifier == KMToolbarViewSettingIdentifier {
-                    Swift.debugPrint("KMToolbarViewSettingIdentifier ...")
+                    toolbarItem.isSelected = !toolbarItem.isSelected
                     rightSideViewController.mainController = self
                     self.rightSideViewController.isHidden = false
                     self.rightSideViewController.subViewType = .ViewSettings
-                    self.openRightPane()
+                    self.toggleRightPane()
                 } else if toolbarItem.itemIdentifier == KMToolbarSnapshotIdentifier {
                     self.listView.takeSnapshot(nil)
                 } else if toolbarItem.itemIdentifier == KMToolbarTTSIdentifier {
-                    Swift.debugPrint("KMToolbarTTSIdentifier ...")
                     self.showTTSWindow()
                 } else if toolbarItem.itemIdentifier == KMToolbarConversionOCRIdentifier {
                     self.showOCRWindow()