Browse Source

【文字图片编辑】文字块进入编辑模式,使用键盘左右方向键,不应响应成翻页

lizhe 1 year ago
parent
commit
f97f3b19ff

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

@@ -1785,30 +1785,46 @@ import Cocoa
         } else if (command && control && theEvent.keyCode == 14) { // command + control + E [注释 橡皮擦]
             return false
         } else if (theEvent.keyCode == 123) { // 向左
-            if (self.pdfViewCanHorizontalScroll() == false && self.listView.canGoToPreviousPage()) {
-                self.listView.goToPreviousPage(nil)
+            if(self.listView.isEditing() && !self.listView.isSelecteditAreaNotEdit()) {
                 return false
+            } else {
+                if (self.pdfViewCanHorizontalScroll() == false && self.listView.canGoToPreviousPage()) {
+                    self.listView.goToPreviousPage(nil)
+                    return false
+                }
             }
         } else if (theEvent.keyCode == 126) { // 向上
-            if (self.listView.isContinousScroll()) {
-                return true
-            }
-            if (self.pdfViewCanVerticalScroll() == false && self.listView.canGoToPreviousPage()) {
-                self.listView.goToPreviousPage(nil)
+            if(self.listView.isEditing() && !self.listView.isSelecteditAreaNotEdit()) {
                 return false
+            } else {
+                if (self.listView.isContinousScroll()) {
+                    return true
+                }
+                if (self.pdfViewCanVerticalScroll() == false && self.listView.canGoToPreviousPage()) {
+                    self.listView.goToPreviousPage(nil)
+                    return false
+                }
             }
         } else if (theEvent.keyCode == 124) { // 向右
-            if (self.pdfViewCanHorizontalScroll() == false && self.listView.canGoToNextPage()) {
-                self.listView.goToNextPage(nil)
+            if(self.listView.isEditing() && !self.listView.isSelecteditAreaNotEdit()) {
                 return false
+            } else {
+                if (self.pdfViewCanHorizontalScroll() == false && self.listView.canGoToNextPage()) {
+                    self.listView.goToNextPage(nil)
+                    return false
+                }
             }
         } else if (theEvent.keyCode == 125) { // 向下
-            if (self.listView.isContinousScroll()) {
-                return true
-            }
-            if (self.pdfViewCanVerticalScroll() == false && self.listView.canGoToNextPage()) {
-                self.listView.goToNextPage(nil)
+            if(self.listView.isEditing() && !self.listView.isSelecteditAreaNotEdit()) {
                 return false
+            } else {
+                if (self.listView.isContinousScroll()) {
+                    return true
+                }
+                if (self.pdfViewCanVerticalScroll() == false && self.listView.canGoToNextPage()) {
+                    self.listView.goToNextPage(nil)
+                    return false
+                }
             }
         }