|
@@ -648,17 +648,22 @@ extension KMMainViewController {
|
|
|
if self.leftPanelOpen {
|
|
|
self.openLeftPane()
|
|
|
}
|
|
|
- if self.rightPanelIsOpen {
|
|
|
- self.rightPanelIsOpen = false
|
|
|
-// self.toolbarController.selectItem(KMRightControlToolbarItemIdentifier)
|
|
|
- self.openRightPane()
|
|
|
- }
|
|
|
|
|
|
- if readToolbarItemIdentifier.count == 0 {
|
|
|
- self.toolbarController.toolbarType = .None
|
|
|
- } else {
|
|
|
- self.toolbarController.selectItem(readToolbarItemIdentifier)
|
|
|
- }
|
|
|
+ self.closeRightPane()
|
|
|
+ self.toolbarController.toolbarType = .None
|
|
|
+ self.toolbarController.cancelSelected(KMDocumentViewDisplayToolbarItemIdentifier)
|
|
|
+
|
|
|
+// if self.rightPanelIsOpen {
|
|
|
+// self.rightPanelIsOpen = false
|
|
|
+//// self.toolbarController.selectItem(KMRightControlToolbarItemIdentifier)
|
|
|
+// self.openRightPane()
|
|
|
+// }
|
|
|
+//
|
|
|
+// if readToolbarItemIdentifier.count == 0 {
|
|
|
+// self.toolbarController.toolbarType = .None
|
|
|
+// } else {
|
|
|
+// self.toolbarController.selectItem(readToolbarItemIdentifier)
|
|
|
+// }
|
|
|
// self.toolbarController.selectItem(KMDocumentViewDisplayToolbarItemIdentifier)
|
|
|
|
|
|
self.leftSideViewController.showPanelView(show: readLeftViewShowPanel)
|
|
@@ -669,7 +674,7 @@ extension KMMainViewController {
|
|
|
self.toolbarController.view.isHidden = false
|
|
|
self.listView.toolMode = readToolMode
|
|
|
self.listView.annotationType = readAnnotationType
|
|
|
- self.toolbarController.toolbarType = .viewSetting
|
|
|
+// self.toolbarController.toolbarType = .viewSetting
|
|
|
} else {
|
|
|
self.toolbarController.toolbarType = .None
|
|
|
}
|