@@ -2,5 +2,5 @@ build *.pbxuser *.perspectivev3 -*.modelv3 +*.mode1v3 .DS_Store .gitignore @@ -3,6 +3,7 @@ #import "Three20/TTURLRequest.h" #import "Three20/TTUnclippedView.h" #import "Three20/TTPhotoView.h" +#import "Three20/TTURLRequestQueue.h" /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -51,6 +52,7 @@ static const NSTimeInterval kSlideshowInterval = 2; } - (void)dealloc { + [[TTURLRequestQueue mainQueue] cancelRequestsWithDelegate:self]; [_thumbsController release]; [_slideshowTimer invalidate]; _slideshowTimer = nil; src/TTPhotoViewController.m @@ -306,7 +306,7 @@ @implementation TTTextViewTableField -@synthesize delegate = _delegate, placeholder = _placeholder, text = _text; +@synthesize delegate = _delegate, placeholder = _placeholder; - (id)initWithText:(NSString*)text { if (self = [self init]) { src/TTTableField.m @@ -5,12 +5,15 @@ @property(nonatomic) CGFloat left; @property(nonatomic) CGFloat top; -@property(nonatomic,readonly) CGFloat right; -@property(nonatomic,readonly) CGFloat bottom; +@property(nonatomic) CGFloat right; +@property(nonatomic) CGFloat bottom; @property(nonatomic) CGFloat width; @property(nonatomic) CGFloat height; +@property(nonatomic) CGFloat centerX; +@property(nonatomic) CGFloat centerY; + @property(nonatomic,readonly) CGFloat screenX; @property(nonatomic,readonly) CGFloat screenY; @property(nonatomic,readonly) CGFloat screenViewX; src/Three20/UIViewAdditions.h @@ -112,10 +112,38 @@ return self.frame.origin.x + self.frame.size.width; } +- (void)setRight:(CGFloat)right { + CGRect frame = self.frame; + frame.origin.x = right - frame.size.width; + self.frame = frame; +} + - (CGFloat)bottom { return self.frame.origin.y + self.frame.size.height; } +- (void)setBottom:(CGFloat)bottom { + CGRect frame = self.frame; + frame.origin.y = bottom - frame.size.height; + self.frame = frame; +} + +- (CGFloat)centerX { + return self.center.x; +} + +- (void)setCenterX:(CGFloat)centerX { + self.center = CGPointMake(centerX, self.center.y); +} + +- (CGFloat)centerY { + return self.center.y; +} + +- (void)setCenterY:(CGFloat)centerY { + self.center = CGPointMake(self.center.x, centerY); +} + - (CGFloat)width { return self.frame.size.width; } src/UIViewAdditions.m d77ad02d462e0035e039827c7b035e6688d57c8e Joe Hewitt joe@joehewitt.com http://github.com/facebook/three20/commit/d75eef3a58febecd4e449f35d3079211c7d81fb2 d75eef3a58febecd4e449f35d3079211c7d81fb2 2009-05-28T18:30:56-07:00 2009-05-28T18:30:56-07:00 * One more iPhone OS 3.0 fix * Merged code from hboon 01ae0e07fd80da1d77ac92e616313e0eae060c7e Joe Hewitt joe@joehewitt.com