I ran into problems with setting the photo center based on the conten…

…tView center after residing the root view. I stripped out contentView because it was extraneous but still had the problem so I switched away from view.center because it's a trap and doesn't always represent the true view center.
kgn · Aug 31, 2012 · e01bc5a · e01bc5a
1 parent 5cc4cf4
commit e01bc5a
Showing 1 changed file with 18 additions and 30 deletions.
diff --git a/Deck/PhotoStackView.m b/Deck/PhotoStackView.m
@@ -15,7 +15,6 @@
 
 @interface PhotoStackView()
 
-    @property (nonatomic, strong) UIView *contentView;
     @property (nonatomic, strong) NSArray *photoViews;
 
 @end
@@ -57,23 +56,13 @@ -(void)setPhotoViews:(NSArray *)photoViews {
             [self makeCrooked:view animated:NO];
         }
 
-        [self.contentView addSubview:view];
+        [self insertSubview:view atIndex:0];
-        [self.contentView sendSubviewToBack:view];
 
     }
 
     _photoViews = photoViews;
 }
 
--(UIView *)contentView {
-
-    if(!_contentView) {
-        _contentView = [[UIView alloc] initWithFrame:self.bounds];
-    }
-
-    return _contentView;
-}
-
 -(UIImage *)borderImage {
     if(!_borderImage) {
         _borderImage = [UIImage imageNamed:@"PhotoBorder"];
@@ -147,7 +136,7 @@ -(void)returnToCenter:(UIView *)photo {
 
     [UIView animateWithDuration:0.2
                      animations:^{
-                         photo.center = CGPointMake(self.contentView.center.x, self.contentView.center.y);
+                         photo.center = CGPointMake(CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds));
                      }];
 }
 
@@ -162,17 +151,18 @@ -(void)flickAway:(UIView *)photo withVelocity:(CGPoint)velocity {
         }
         [self.delegate photoStackView:self willFlickAwayPhotoFromIndex:fromIndex toIndex:toIndex];
     }
-
+
-    CGFloat xPos = (velocity.x < 0) ? self.contentView.center.x-self.contentView.frame.size.width : self.contentView.center.y+self.contentView.frame.size.width;
+    CGFloat width = CGRectGetWidth(self.bounds);
+    CGFloat xPos = (velocity.x < 0) ? CGRectGetMidX(self.bounds)-width : CGRectGetMidY(self.bounds)+width;
 
     [UIView animateWithDuration:0.1
                      animations:^{
-                         photo.center = CGPointMake(xPos, self.contentView.center.y);
+                         photo.center = CGPointMake(xPos, CGRectGetMidY(self.bounds));
                      }
                      completion:^(BOOL finished){
 
                          [self makeCrooked:photo animated:YES];
-                         [self.contentView sendSubviewToBack:photo];
+                         [self sendSubviewToBack:photo];
                          [self makeStraight:[self topPhoto] animated:YES];
                          [self returnToCenter:photo];
 
@@ -224,8 +214,8 @@ -(void)makeStraight:(UIView *)photo animated:(BOOL)animated {
 -(void)photoPanned:(UIPanGestureRecognizer *)gesture {
 
     UIView *topPhoto = [self topPhoto];
-    CGPoint velocity = [gesture velocityInView:self.contentView];
+    CGPoint velocity = [gesture velocityInView:self];
-    CGPoint translation = [gesture translationInView:self.contentView];
+    CGPoint translation = [gesture translationInView:self];
 
     if(gesture.state == UIGestureRecognizerStateBegan) {
 
@@ -243,7 +233,7 @@ -(void)photoPanned:(UIPanGestureRecognizer *)gesture {
         CGFloat yPos = topPhoto.center.y + translation.y;
 
         topPhoto.center = CGPointMake(xPos, yPos);
-        [gesture setTranslation:CGPointMake(0, 0) inView:self.contentView];
+        [gesture setTranslation:CGPointMake(0, 0) inView:self];
 
 
     } else if(gesture.state == UIGestureRecognizerStateEnded || gesture.state == UIGestureRecognizerStateCancelled) {
@@ -298,7 +288,7 @@ -(void)flipToNextPhoto{
 -(void)goToPhotoAtIndex:(NSUInteger)index {
     for (UIView *view in self.photoViews) {
         if([self.photoViews indexOfObject:view] < index) {
-            [self.contentView sendSubviewToBack:view];
+            [self sendSubviewToBack:view];
         }
     }
     [self makeStraight:[self topPhoto] animated:NO];
@@ -309,7 +299,7 @@ -(NSUInteger)indexOfTopPhoto {
 }
 
 -(UIView *)topPhoto {
-    return [self.contentView.subviews objectAtIndex:[self.contentView.subviews count]-1];
+    return [self.subviews objectAtIndex:[self.subviews count]-1];
 }
 
 -(void)sendActionsForControlEvents:(UIControlEvents)controlEvents {
@@ -378,12 +368,12 @@ -(void)reloadData {
             [view addSubview:photoImageView];
 
             view.tag    = index;
-            view.center = self.contentView.center;
+            view.center = CGPointMake(CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds));
-            
+
             [photoViewsMutable addObject:view];
 
         }
-        
+
         // Photo views are added to subview in the photoView setter
         self.photoViews = photoViewsMutable; photoViewsMutable = nil;
         [self goToPhotoAtIndex:topPhotoIndex];
@@ -403,15 +393,14 @@ -(void)setup {
     UIPanGestureRecognizer *panGesture = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(photoPanned:)];
     [panGesture setMaximumNumberOfTouches:1];
     panGesture.delegate = self;
-    [self.contentView addGestureRecognizer:panGesture];
+    [self addGestureRecognizer:panGesture];
 
     // Add Tap Gesture
     UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(photoTapped:)];
     [tapGesture setNumberOfTapsRequired:1];
     tapGesture.delegate = self;
-    [self.contentView addGestureRecognizer:tapGesture];
+    [self addGestureRecognizer:tapGesture];
-
+
-    [self addSubview:self.contentView];
     [self reloadData];
 }
 
@@ -433,7 +422,6 @@ -(void)dealloc {
     [self setPhotoViews:nil];
     [self setBorderImage:nil];
     [self setHighlightColor:nil];
-    [self setContentView:nil];
 }
 
 @end