Browse Source

【页面显示】先展开属性栏,再点击页面显示按钮,此时属性栏不应该收缩

liujiajie 10 months ago
parent
commit
94f69eb22e

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

@@ -4621,6 +4621,15 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     let isSelected = toolbarItem.isSelected
                     self.toolbarController.toolbarType = isSelected ? .None : .viewSetting
                     toolbarItem.isSelected = !isSelected
+                    if toolbarItem.isSelected {
+                        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting"])
+                        self.rightSideViewController.isHidden = false
+                        self.rightSideViewController.subViewType = .ViewSettings
+                        self.openRightPane()
+                    }else{
+                        self.rightSideViewController.isHidden = true
+                        closeRightPane()
+                    }
                     if toolbarItem.isSelected {
                         FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn": "Btn_Tbr_PageDisplay"])
                     }
@@ -4694,11 +4703,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     self.km_beginSheet(windowC: windowC)
                 } else if toolbarItem.itemIdentifier == KMToolbarViewSettingIdentifier {
                     toolbarItem.isSelected = !toolbarItem.isSelected
-                    FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting"])
                     rightSideViewController.mainController = self
-                    self.rightSideViewController.isHidden = false
-                    self.rightSideViewController.subViewType = .ViewSettings
-                    self.toggleRightPane()
                 } else if toolbarItem.itemIdentifier == KMToolbarSnapshotIdentifier {
                     FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_Snapshot"])
                     self.listView.takeSnapshot(nil)