Browse Source

【Crash】修复特殊文档上选中Form模式滑动鼠标崩溃(可能是在Link上滑动有问题)

wanjun 10 months ago
parent
commit
affc2d3899

+ 13 - 7
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -128,19 +128,25 @@ import Cocoa
     }
     
     override func windowShouldClose(_ sender: NSWindow) -> Bool {
-#if DEBUG
-        if self.browser.tabStripModel.count() > 1 {
-            self.browser.windowDidBeginToClose()
-            return false
-        }
-#else
+//#if DEBUG
+//        if self.browser.tabStripModel.count() > 1 {
+//            self.browser.windowDidBeginToClose()
+//            return false
+//        }
+//#else
+//        if let cnt = self.browser?.tabStripModel?.count(), cnt > 1 {
+//            if self.browser?.window != nil {
+//                self.browser?.windowDidBeginToClose()
+//            }
+//            return false
+//        }
+//#endif
         if let cnt = self.browser?.tabStripModel?.count(), cnt > 1 {
             if self.browser?.window != nil {
                 self.browser?.windowDidBeginToClose()
             }
             return false
         }
-#endif
         return true
     }
     

+ 12 - 8
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMImageToolTipWindow.swift

@@ -64,14 +64,18 @@ class KMImageToolTipWindow: KMAnimatedBorderlessWindow {
     // MARK: - Public Methods
     
     public func showForImageContext(_ aContext: KMImageToolTipContext, at aPoint: NSPoint) {
-        self.point = aPoint
-        
-        if aContext.isEqual(self.context) == false {
-            self.stopAnimation()
-            
-            self.context = aContext
-            
-            self.perform(#selector(_showDelayed), with: nil, afterDelay: self.isVisible ? ALT_SHOW_DELAY: DEFAULT_SHOW_DELAY)
+        if aContext != nil {
+            if aContext.isEqual(self.context) == false {
+                self.point = aPoint
+                
+                if aContext.isEqual(self.context) == false {
+                    self.stopAnimation()
+                    
+                    self.context = aContext
+                    
+                    self.perform(#selector(_showDelayed), with: nil, afterDelay: self.isVisible ? ALT_SHOW_DELAY: DEFAULT_SHOW_DELAY)
+                }
+            }
         }
     }