|
@@ -27,8 +27,9 @@
|
|
|
|
|
|
|
|
self.editContainer.layer.borderColor = [UIColor whiteColor].CGColor;
|
|
self.editContainer.layer.borderColor = [UIColor whiteColor].CGColor;
|
|
|
self.editContainer.layer.borderWidth = 0.5f;
|
|
self.editContainer.layer.borderWidth = 0.5f;
|
|
|
- UIPinchGestureRecognizer *pinch = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(imageViewPinch:)];
|
|
|
|
|
- [self.editContainer addGestureRecognizer:pinch];
|
|
|
|
|
|
|
+ self.editContainer.userInteractionEnabled = NO;
|
|
|
|
|
+// UIPinchGestureRecognizer *pinch = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(imageViewPinch:)];
|
|
|
|
|
+// [self.editContainer addGestureRecognizer:pinch];
|
|
|
|
|
|
|
|
[self.previewScroll addSubview:self.imgView];
|
|
[self.previewScroll addSubview:self.imgView];
|
|
|
}
|
|
}
|
|
@@ -133,9 +134,9 @@
|
|
|
|
|
|
|
|
#pragma mark - UIScrollViewDelegate
|
|
#pragma mark - UIScrollViewDelegate
|
|
|
|
|
|
|
|
-//- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView {
|
|
|
|
|
-// return self.imgView;
|
|
|
|
|
-//}
|
|
|
|
|
|
|
+- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView {
|
|
|
|
|
+ return self.imgView;
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
#pragma mark - pinch
|
|
#pragma mark - pinch
|
|
|
|
|
|