fixed the multiplying image on cancel issue.
This commit is contained in:
parent
508fa38dc2
commit
67e12ed35a
1 changed files with 3 additions and 4 deletions
|
@ -78,7 +78,6 @@
|
||||||
previewImageView = [[UIImageView alloc] initWithImage:image];
|
previewImageView = [[UIImageView alloc] initWithImage:image];
|
||||||
|
|
||||||
largeImage = image;
|
largeImage = image;
|
||||||
//scrollView.contentSize = previewImageView.frame.size;
|
|
||||||
scrollView.contentSize = CGSizeMake(IMAGE_WIDTH, IMAGE_HEIGHT);
|
scrollView.contentSize = CGSizeMake(IMAGE_WIDTH, IMAGE_HEIGHT);
|
||||||
[scrollView addSubview:previewImageView];
|
[scrollView addSubview:previewImageView];
|
||||||
[previewImageView release];
|
[previewImageView release];
|
||||||
|
@ -86,13 +85,13 @@
|
||||||
scrollView.maximumZoomScale = 8.0;
|
scrollView.maximumZoomScale = 8.0;
|
||||||
scrollView.delegate = self;
|
scrollView.delegate = self;
|
||||||
[scrollView setZoomScale:1];
|
[scrollView setZoomScale:1];
|
||||||
[image release];
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)cancelPreview:(id)sender {
|
- (IBAction)cancelPreview:(id)sender {
|
||||||
[[UIApplication sharedApplication] setStatusBarStyle:originalStatusBarStyle animated:YES];
|
[[UIApplication sharedApplication] setStatusBarStyle:originalStatusBarStyle animated:YES];
|
||||||
|
[previewImageView removeFromSuperview];
|
||||||
[self.navigationController popViewControllerAnimated:YES];
|
[self.navigationController popViewControllerAnimated:YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +103,7 @@
|
||||||
#pragma mark ScrollView Bits
|
#pragma mark ScrollView Bits
|
||||||
|
|
||||||
- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollview {
|
- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollview {
|
||||||
return self.previewImageView;
|
return previewImageView;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (CGRect)zoomRectForScale:(float)scale withCenter:(CGPoint)center {
|
- (CGRect)zoomRectForScale:(float)scale withCenter:(CGPoint)center {
|
||||||
|
@ -126,7 +125,6 @@
|
||||||
|
|
||||||
- (void)zoomAction:(UIGestureRecognizer *)gestureRecognizer {
|
- (void)zoomAction:(UIGestureRecognizer *)gestureRecognizer {
|
||||||
// double tap zooms in
|
// double tap zooms in
|
||||||
NSLog(@"Hit the gestureRecognizer");
|
|
||||||
float newScale = [self.scrollView zoomScale] * 2;
|
float newScale = [self.scrollView zoomScale] * 2;
|
||||||
CGRect zoomRect = [self zoomRectForScale:newScale withCenter:[gestureRecognizer locationInView:gestureRecognizer.view]];
|
CGRect zoomRect = [self zoomRectForScale:newScale withCenter:[gestureRecognizer locationInView:gestureRecognizer.view]];
|
||||||
[self.scrollView zoomToRect:zoomRect animated:YES];
|
[self.scrollView zoomToRect:zoomRect animated:YES];
|
||||||
|
@ -145,6 +143,7 @@
|
||||||
// Release any retained subviews of the main view.
|
// Release any retained subviews of the main view.
|
||||||
// e.g. self.myOutlet = nil;
|
// e.g. self.myOutlet = nil;
|
||||||
//[scrollView release];
|
//[scrollView release];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Reference in a new issue