|
@@ -1796,20 +1796,26 @@ struct KMNMWCFlags {
|
|
|
}
|
|
|
toggleClosePopUIWindow()
|
|
|
} else if(listView.isEditing() == false) {
|
|
|
- if(listView.popOver == nil || listView.popOver?.isShown == false) {
|
|
|
- let activeAnnotations:[CPDFAnnotation] = listView.activeAnnotations as! [CPDFAnnotation]
|
|
|
- if(activeAnnotations.count > 0) {
|
|
|
- if let page = activeAnnotations.first?.page {
|
|
|
- let pageRect = listView.selectionMultipleBounds(with: activeAnnotations)
|
|
|
- let positioningRect = listView.convert(pageRect, from: page)
|
|
|
- if (CGRectIntersectsRect(positioningRect, listView.frame)) {
|
|
|
- reloadPopUIActiveAnnotations(activeAnnotations: activeAnnotations)
|
|
|
- return
|
|
|
- }
|
|
|
+ let activeAnnotations:[CPDFAnnotation] = listView.activeAnnotations as! [CPDFAnnotation]
|
|
|
+ if(activeAnnotations.count > 0) {
|
|
|
+ if let page = activeAnnotations.first?.page {
|
|
|
+ let pageRect = listView.selectionMultipleBounds(with: activeAnnotations)
|
|
|
+ let positioningRect = listView.convert(pageRect, from: page)
|
|
|
+ if (CGRectIntersectsRect(positioningRect, listView.frame)) {
|
|
|
+ reloadPopUIActiveAnnotations(activeAnnotations: activeAnnotations)
|
|
|
+ } else {
|
|
|
+ toggleClosePopUIWindow()
|
|
|
}
|
|
|
+ } else {
|
|
|
+ toggleClosePopUIWindow()
|
|
|
}
|
|
|
+ } else {
|
|
|
+ toggleClosePopUIWindow()
|
|
|
+ }
|
|
|
+
|
|
|
+ if(listView.popOver?.isShown == true || (groupListMenuGroup?.superview) != nil) { //右键菜单弹出时,或者Pop编辑框弹出时不显示Pop
|
|
|
+ toggleClosePopUIWindow()
|
|
|
}
|
|
|
- toggleClosePopUIWindow()
|
|
|
} else {
|
|
|
let editAreas:[CPDFEditArea] = listView.km_EditingAreas()
|
|
|
if(editAreas.count > 0) {
|
|
@@ -1818,12 +1824,19 @@ struct KMNMWCFlags {
|
|
|
let positioningRect = listView.convert(pageRect, from: page)
|
|
|
if (CGRectIntersectsRect(positioningRect, listView.frame)) {
|
|
|
reloadPopUIContentEdits(editAreas: editAreas)
|
|
|
- return
|
|
|
+ } else {
|
|
|
+ toggleClosePopUIWindow()
|
|
|
}
|
|
|
+ } else {
|
|
|
+ toggleClosePopUIWindow()
|
|
|
}
|
|
|
+ } else {
|
|
|
+ toggleClosePopUIWindow()
|
|
|
}
|
|
|
|
|
|
- toggleClosePopUIWindow()
|
|
|
+ if(listView.popOver?.isShown == true || (groupListMenuGroup?.superview) != nil) { //右键菜单弹出时,或者Pop编辑框弹出时不显示Pop
|
|
|
+ toggleClosePopUIWindow()
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -5446,6 +5459,7 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
|
|
|
|
|
|
groupListMenuGroup?.showWithPoint(CGPoint(x: point.x, y: point.y - menuStruct.viewHeight), relativeTo: pdfListView)
|
|
|
}
|
|
|
+ reloadPopUIWindow()
|
|
|
}
|
|
|
|
|
|
func pdfListViewMenuItemsEditing(at point: CGPoint, for page: CPDFPage!, menuItems: [NSMenuItem]!) -> [NSMenuItem]! {
|