Skip to content

Commit e89d57a

Browse files
committed
Thumbnail click logic bug fix for last update
1 parent 446b99e commit e89d57a

File tree

4 files changed

+10
-27
lines changed

4 files changed

+10
-27
lines changed

Demo/Demo/RootViewController.m

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -149,19 +149,11 @@ - (NSInteger)numberOfThumbnailsInRowForThumbnailGridView:(VCThumbnailGridView *)
149149
return 3;
150150
}
151151

152-
- (UIImage*)thumbnailGridView:(VCThumbnailGridView*)thumbnailGridView imageAtIndex:(NSInteger)index
152+
- (VCThumbnailView *)thumbnailGridView:(VCThumbnailGridView *)thumbnailGridView thumbnailViewAtIndex:(NSInteger)index
153153
{
154-
return [UIImage imageNamed:@"Icon.png"];
155-
}
156-
157-
- (NSString*)thumbnailGridView:(VCThumbnailGridView*)thumbnailGridView imageUrlAtIndex:(NSInteger)index
158-
{
159-
static bool something = false;
160-
something = !something;
161-
if (something) {
162-
return [NSString stringWithString:@"http://images.apple.com/support/home/images/featured_itunes.png"];
163-
}
164-
return nil;
154+
VCThumbnailView *thumbnailView = [[VCThumbnailView alloc] initWithFrame:CGRectZero];
155+
[thumbnailView setImage:[UIImage imageNamed:@"Icon.png"]];
156+
return [thumbnailView autorelease];
165157
}
166158

167159
#pragma mark - VCThumbnailGridViewDelegate

VCThumbnailGridView/VCThumbnailGridView.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@
3333

3434
#import <UIKit/UIKit.h>
3535

36+
#import "VCThumbnailViewCell.h"
37+
3638
@protocol VCThumbnailGridViewDataSource;
3739
@protocol VCThumbnailGridViewDelegate;
3840

3941
@class VCThumbnailView;
40-
@class VCThumbnailViewCell;
4142

4243
@interface VCThumbnailGridView : UIView <UITableViewDataSource, UITableViewDelegate> {
4344
@private
@@ -68,7 +69,7 @@
6869
@optional
6970
- (NSInteger)numberOfThumbnailsInRowForThumbnailGridView:(VCThumbnailGridView *)thumbnailGridView;
7071
- (VCThumbnailView *)thumbnailGridView:(VCThumbnailGridView *)thumbnailGridView thumbnailViewAtIndex:(NSInteger)index;
71-
- (UIImage *)thumbnailGridView:(VCThumbnailGridView *)thumbnailGridView imageAtIndex:(NSInteger)index;
72+
//- (UIImage *)thumbnailGridView:(VCThumbnailGridView *)thumbnailGridView imageAtIndex:(NSInteger)index;
7273

7374
@end
7475

VCThumbnailGridView/VCThumbnailGridView.m

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
140140
int indexOfImage = indexPath.row * _numberOfThumbnailsInRow;
141141

142142
VCThumbnailView *thumbnail = nil;
143-
BOOL respondsToSelectorImage = [self.dataSource respondsToSelector:@selector(thumbnailGridView:imageAtIndex:)];
144143
BOOL respondsToSelectorView = [self.dataSource respondsToSelector:@selector(thumbnailGridView:thumbnailViewAtIndex:)];
145144
for (int i = 0; i < _numberOfThumbnailsInRow; i++) {
146145
if (indexOfImage < _numberOfThumbnails) {
@@ -153,25 +152,16 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
153152
}
154153

155154
// set proerties
156-
thumbnail.backgroundColor = [UIColor whiteColor];
155+
thumbnail.tag = indexOfImage;
156+
[thumbnail addTarget:self withSelector:@selector(didTapImageThumbnail:)];
157157
[cell addSubview:thumbnail];
158158
[cell.thumbnails addObject:thumbnail];
159-
160-
thumbnail.hidden = NO;
161-
if (respondsToSelectorImage) {
162-
[thumbnail setImage:[self.dataSource thumbnailGridView:self imageAtIndex:indexOfImage]];
163-
[thumbnail addTarget:self withSelector:@selector(didTapImageThumbnail:)];
164-
}
165159
thumbnail.tag = indexOfImage++;
166-
}else {
167-
thumbnail.hidden = YES;
168160
}
169-
170161
thumbnail = nil;
171162
}
172163
}
173164

174-
175165
return cell;
176166
}
177167

VCThumbnailGridView/VCThumbnailView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ - (id)initWithFrame:(CGRect)frame {
4444
shouldAutoRotateToFit = NO;
4545
self.autoresizesSubviews = YES;
4646
self.backgroundColor = [UIColor clearColor];
47-
self.userInteractionEnabled = NO;
47+
self.userInteractionEnabled = YES;
4848
self.contentMode = UIViewContentModeScaleAspectFit;
4949
self.layer.borderColor = [[UIColor lightGrayColor] CGColor];
5050
self.layer.borderWidth = 1.0f;

0 commit comments

Comments
 (0)