PDFTools(iOS) - 修复图片模式 文字模式的bug

compdfkit-tools/compdfkit-tools/Common/Views/PDFView/PDFListView/CPDFListView+Edit.h

@@ -11,22 +11,6 @@
 #import <compdfkit_tools/CPDFListView.h>
 #import <ComPDFKit/ComPDFKit.h>
 
-@interface CPDFEditArea (Editing)
-
-- (BOOL)IsImageArea;
-
-@end
-
-#pragma mark - CPDFEditImageArea
-
-@interface CPDFEditImageArea : CPDFEditArea
-
-@property (nonatomic,readonly) CGRect cropRect;
-@property (nonatomic,assign)   BOOL isCropMode;
-
-@end
-
-
 @interface CPDFListView (Edit)<UINavigationControllerDelegate,UIImagePickerControllerDelegate>
 
 

compdfkit-tools/compdfkit-tools/Common/Views/PDFView/PDFListView/CPDFListView+Edit.m

@@ -60,7 +60,6 @@
                 
                 UIMenuItem * opacityItem  = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Opacity", nil) action:@selector(opacityEditingItemAction:)];
                 
-                UIMenuItem * rotateItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Rotate", nil) action:@selector(rotateActionClick:)];
                 UIMenuItem * hMirrorItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"HMirror", nil) action:@selector(horizontalMirrorClick:)];
                 UIMenuItem * vMirrorItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"VMirror", nil) action:@selector(verticalMirrorClick:)];
                 
@@ -71,7 +70,6 @@
                 [menuItems addObject:leftRotateItem];
                 [menuItems addObject:rightRotateItem];
                 [menuItems addObject:rPlaceItem];
-                [menuItems addObject:rotateItem];
                 [menuItems addObject:cropItem];
                 [menuItems addObject:opacityItem];
 
@@ -126,12 +124,12 @@
 
 - (void)doneActionClick:(UIMenuItem*)menuItem{
     CPDFEditImageArea * editArea = (CPDFEditImageArea *)self.editingArea;
-    [self cropEditArea:self.editingArea WithRect:editArea.cropRect];
-    [self endCropEditArea:self.editingArea];
+    [self cropEditArea:editArea withRect:editArea.cropRect];
+    [self endCropEditArea:editArea];
 }
 
 - (void)cancelActionClick:(UIMenuItem*)menuItem{
-    [self endCropEditArea:self.editingArea];
+    [self endCropEditArea:(CPDFEditImageArea*)self.editingArea];
 }
 
 - (void)deleteActionClick:(UIMenuItem*)menuItem{
@@ -146,8 +144,9 @@
 }
 
 - (void)propertyEditingItemAction:(UIMenuItem*)menuItem {
-    if(self.performDelegate && [self.performDelegate respondsToSelector:@selector(PDFViewCustomMenuClick:identifier:)]){
-        [self.performDelegate PDFViewCustomMenuClick:self identifier:@"PropertyItem"];
+    
+    if(self.performDelegate && [self.performDelegate respondsToSelector:@selector(PDFListViewCustomMenuClick:identifier:)]) {
+        [self.performDelegate PDFListViewCustomMenuClick:self identifier:@"PropertyItem"];
     }
 }
 

compdfkit-tools/compdfkit-tools/Edit/CPDFEditToolBar/CPDFEditToolBar.m

@@ -110,9 +110,6 @@
         [self.imageEditButton setSelected:NO];
     }
     
-    if(sender.selected == NO) {
-        [self.pdfView endOfEditing];
-    }
     
     if(sender.selected == NO && self.imageEditButton.selected == NO){
         if(self.delegate && [self.delegate respondsToSelector:@selector(editClickInToolBar:editMode:)]){
@@ -128,9 +125,6 @@
 - (void)imageEditAction:(UIButton*)sender {
     sender.selected = !sender.selected;
     
-    if(sender.selected == NO) {
-        [self.pdfView endOfEditing];
-    }
     
     if(sender.selected == YES){
         [self.textEditButton setSelected:NO];