|
@@ -737,11 +737,15 @@ extension KMHomeViewController {
|
|
|
let x = eventPoint.x - 270.0
|
|
|
if x >= 0 {
|
|
|
let point = NSPoint(x: x, y: eventPoint.y)
|
|
|
- if historyFileViewController.historyFileCollectionView.frame.contains(point) ||
|
|
|
+ let historyPoint = historyFileViewController.historyFileCollectionView.convert(eventPoint, from: nil)
|
|
|
+ let indexPath = historyFileViewController.historyFileCollectionView.indexPathForItem(at: historyPoint)
|
|
|
+// debugPrint(historyPoint)
|
|
|
+// debugPrint(indexPath)
|
|
|
+ if (historyFileViewController.historyFileCollectionView.frame.contains(point) ||
|
|
|
historyFileViewController.historyFileTableView.frame.contains(point) ||
|
|
|
historyFileViewController.deleteBox.frame.contains(point) ||
|
|
|
historyFileViewController.listBox.frame.contains(point) ||
|
|
|
- historyFileViewController.thumbnailBox.frame.contains(point) {
|
|
|
+ historyFileViewController.thumbnailBox.frame.contains(point)) && indexPath != nil {
|
|
|
|
|
|
} else {
|
|
|
self.historyFileViewController.selectFiles.removeAll()
|
|
@@ -1207,12 +1211,12 @@ extension KMHomeViewController {
|
|
|
}
|
|
|
|
|
|
@IBAction func escButtonAction(_ sender: Any) {
|
|
|
- self.historyFileViewController.selectFiles.removeAll()
|
|
|
- if self.historyFileViewController.showMode == .Thumbnail {
|
|
|
- self.historyFileViewController.historyFileCollectionView.reloadData()
|
|
|
- } else {
|
|
|
- self.historyFileViewController.historyFileTableView.reloadData()
|
|
|
- }
|
|
|
+// self.historyFileViewController.selectFiles.removeAll()
|
|
|
+// if self.historyFileViewController.showMode == .Thumbnail {
|
|
|
+// self.historyFileViewController.historyFileCollectionView.reloadData()
|
|
|
+// } else {
|
|
|
+// self.historyFileViewController.historyFileTableView.reloadData()
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
|