diff --git a/Classes/JPImagePickerDetailController.m b/Classes/JPImagePickerDetailController.m index e9d1225..d47f37a 100644 --- a/Classes/JPImagePickerDetailController.m +++ b/Classes/JPImagePickerDetailController.m @@ -73,18 +73,35 @@ UIImage * image = [[overviewController.imagePickerController.dataSource imagePicker:overviewController.imagePickerController imageForImageNumber:imageNumber] - scaleToSize:CGSizeMake(kJPImagePickerControllerPreviewImageSizeHeight, kJPImagePickerControllerPreviewImageSizeHeight) + scaleToSize:CGSizeMake(kJPImagePickerControllerPreviewImageSizeWidth, kJPImagePickerControllerPreviewImageSizeHeight) onlyIfNeeded:YES]; previewImageView = [[UIImageView alloc] initWithImage:image]; largeImage = image; + //Center the image code + CGRect frameToCenter = previewImageView.frame; + CGSize boundsSize = CGSizeMake(kJPImagePickerControllerPreviewImageSizeWidth, kJPImagePickerControllerPreviewImageSizeHeight); + if (frameToCenter.size.width < boundsSize.width) + frameToCenter.origin.x = (boundsSize.width - frameToCenter.size.width) / 2; + else + frameToCenter.origin.x = 0; + + // center vertically + if (frameToCenter.size.height < boundsSize.height) + frameToCenter.origin.y = (boundsSize.height - frameToCenter.size.height) / 2; + else + frameToCenter.origin.y = 0; + + previewImageView.frame = frameToCenter; + //Create Scroll view and add the ImageViewController. - scrollView.contentSize = CGSizeMake(IMAGE_WIDTH, IMAGE_HEIGHT); + scrollView.contentSize = CGSizeMake(kJPImagePickerControllerPreviewImageSizeWidth, kJPImagePickerControllerPreviewImageSizeHeight); [scrollView addSubview:previewImageView]; [previewImageView release]; scrollView.minimumZoomScale = 0.4; scrollView.maximumZoomScale = 8.0; scrollView.delegate = self; + [scrollView setZoomScale:1]; }