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

@@ -386,8 +386,10 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
     }
     
     func toolbarViewController(_ viewController: KMToolbarViewController, clickMode toolMode: KMToolbarViewType, toolbar toolbarItem: KMToolBoxItem) {
-        if toolMode != .Magnify && toolMode != .Move && toolMode != .Select && toolMode != .SelectZoom && toolMode != .LeftPanel && toolMode != .RightPanel {
+        if self.lastItemBox != nil {
             self.lastItemBox.isSelected = false
+        }
+        if toolMode != .Magnify && toolMode != .Move && toolMode != .Select && toolMode != .SelectZoom && toolMode != .LeftPanel && toolMode != .RightPanel {
             if(toolMode == self.toolbarType) {
                 toolbarItem.isSelected = false
             } else {
@@ -395,7 +397,7 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
                 self.lastItemBox = toolbarItem
             }
         } else {
-            if(toolMode != self.toolbarType) {
+            if(toolMode != self.toolbarType && toolMode != .LeftPanel) {
                 let item : KMToolBoxItem = (self.mainToolBarView?.toolbarItemFindItemIdentifiers(value: KMDocumentAnnotationToolbarItemIdentifier))!
                 item.isSelected = true
                 self.lastItemBox = item

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

@@ -290,7 +290,7 @@ extension KMMainViewController {
     }
     
     func printingMenu() -> NSMenuItem {
-        let menuItem = NSMenuItem(title: NSLocalizedString("Print", comment: ""), action: #selector(menuItemAnnotationClick_Print), target: self)!
+        let menuItem = NSMenuItem(title: NSLocalizedString("Print", comment: ""), action: #selector(menuItemAnnotationClick_Print), keyEquivalent: "p")
         return menuItem
     }
     

PDF Office/PDF Office/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift

@@ -70,6 +70,7 @@ extension KMMainViewController {
                 if mouseEntered == false  && self.isEditPage == false {
                     self.tipCurrentPageBox.fillColor = NSColor(calibratedRed: 0, green: 0, blue: 0, alpha: 0.5)
                     self.currentPageLabel.textColor = NSColor.white
+                    self.currentPageLabel.isHidden = false
                     self.pageCountLabel.textColor = NSColor.white
                     self.currentPageWidthConstraint.constant = NSString(string: self.currentPageLabel.stringValue).boundingRect(with: NSSize(width: 1000, height: 1000)).size.width + 8
                     DispatchQueue.main.async {
@@ -102,6 +103,9 @@ extension KMMainViewController {
     
     func hiddenPageIndicator() {
         DispatchQueue.main.async {
+            self.currentPageLabel.isEditable = false
+            self.currentPageLabel.isHidden = true
+            self.currentPageLabel.isSelectable = false
             self.tipCurrentPageBox.fillColor = NSColor.clear
             self.currentPageLabel.textColor = NSColor.clear
             self.pageCountLabel.textColor = NSColor.clear

PDF Office/PDF Office/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -754,6 +754,8 @@ import Cocoa
         self.currentPageWidthConstraint.constant = NSString(string: self.currentPageLabel.stringValue).boundingRect(with: NSSize(width: 1000, height: 1000)).size.width + 8
         self.tipCurrentPageBox.fillColor = NSColor(calibratedRed: 0, green: 0, blue: 0, alpha: 0.5)
         self.currentPageLabel.textColor = NSColor.white
+        self.currentPageLabel.isHidden = false
+        self.currentPageLabel.isSelectable = false
         self.pageCountLabel.textColor = NSColor.white
 
         DispatchQueue.main.async {