Browse Source

【fix】【阅读】重新打开文档,没有默认记住上次浏览的页码

tangchao 6 months ago
parent
commit
264b334a1b

+ 8 - 0
PDF Office/PDF Master/Class/Common/KMCommonDefine.swift

@@ -82,6 +82,14 @@ public func KMValidateEmail(email: String) -> Bool {
     return pred.evaluate(with: email)
 }
 
+public func KMMainThreadExecute(_ execute: @escaping (()->Void)) {
+    if Thread.isMainThread {
+        execute()
+    } else {
+        DispatchQueue.main.async(execute: execute)
+    }
+}
+
 // ColumnID
 
 let kPageColumnId = NSUserInterfaceItemIdentifier(rawValue: "page")

+ 2 - 2
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift

@@ -318,7 +318,7 @@ class KMLeftSideViewController: KMSideViewController {
                 }
                 FMTrackEventManager.defaultManager.trackEvent(event: "LeftSidebar", withProperties: ["LeftSidebar_Btn": "Btn_LeftSidebar_Thumbnail"])
                 self.refreshMethodType(methodType: .Thumbnail)
-                DispatchQueue.main.async {
+                KMMainThreadExecute {
                     self.toolButtonBox.contentView = self.thumbnailView
                     self.displayThumbnailViewAnimating(false)
                 }
@@ -739,7 +739,7 @@ class KMLeftSideViewController: KMSideViewController {
             }
         }
         
-        DispatchQueue.main.async {
+        KMMainThreadExecute {
             let ris = self.thumbnailTableView.selectedRowIndexes
             self.thumbnailTableView.reloadData()
             if ks {

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -594,7 +594,7 @@ import Cocoa
         if self.model.leftPanelOpen {
             return
         }
-        Task { @MainActor in
+        KMMainThreadExecute {
             self.leftSideViewController.showThumbnail()
             self.toolbarController.findItem(KMLeftControlToolbarItemIdentifier)?.isSelected = true
         }