forked from facebookarchive/three20
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* New class: TTPageControl - just like UIPageControl, but with stylab…
…le dots. * Fixed: infinite loop in TTTableViewController (thanks to Gary B. for fix) * Fixed: TTWebController back/forward buttons got out of sync (thanks to holtwick fix) * Fixed: TTTextStyle doesn't respect vertical alignment for multi-line text * Fixed: During TTNavigator-imposed delay, TTTableViewDataSource should appear to be loading * Fixed: diffstrings omits some strings from generated xml file
- Loading branch information
Showing
19 changed files
with
289 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| #include "Three20/TTPageControl.h" | ||
| #include "Three20/TTStyleSheet.h" | ||
| #include "Three20/TTStyle.h" | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| @implementation TTPageControl | ||
|
|
||
| @synthesize numberOfPages = _numberOfPages, currentPage = _currentPage, dotStyle = _dotStyle; | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| // NSObject | ||
|
|
||
| - (TTStyle*)normalDotStyle { | ||
| if (!_normalDotStyle) { | ||
| _normalDotStyle = [[[TTStyleSheet globalStyleSheet] styleWithSelector:_dotStyle | ||
| forState:UIControlStateNormal] retain]; | ||
| } | ||
| return _normalDotStyle; | ||
| } | ||
|
|
||
| - (TTStyle*)currentDotStyle { | ||
| if (!_currentDotStyle) { | ||
| _currentDotStyle = [[[TTStyleSheet globalStyleSheet] styleWithSelector:_dotStyle | ||
| forState:UIControlStateSelected] retain]; | ||
| } | ||
| return _currentDotStyle; | ||
| } | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| // NSObject | ||
|
|
||
| - (id)initWithFrame:(CGRect)frame { | ||
| if (self = [super initWithFrame:frame]) { | ||
| _numberOfPages = 0; | ||
| _currentPage = 0; | ||
| _dotStyle = nil; | ||
| _normalDotStyle = nil; | ||
| _currentDotStyle = nil; | ||
|
|
||
| self.backgroundColor = [UIColor clearColor]; | ||
| self.dotStyle = @"pageDot:"; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)dealloc { | ||
| TT_RELEASE_SAFELY(_dotStyle); | ||
| TT_RELEASE_SAFELY(_normalDotStyle); | ||
| TT_RELEASE_SAFELY(_currentDotStyle); | ||
| [super dealloc]; | ||
| } | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| // UIView | ||
|
|
||
| - (void)drawRect:(CGRect)rect { | ||
| TTStyleContext* context = [[[TTStyleContext alloc] init] autorelease]; | ||
| TTBoxStyle* boxStyle = [self.normalDotStyle firstStyleOfClass:[TTBoxStyle class]]; | ||
|
|
||
| CGSize dotSize = [self.normalDotStyle addToSize:CGSizeZero context:context]; | ||
| CGRect contentRect = CGRectMake(0, 0, dotSize.width, dotSize.height); | ||
|
|
||
| for (NSInteger i = 0; i < _numberOfPages; ++i) { | ||
| contentRect.origin.x += boxStyle.margin.left; | ||
|
|
||
| context.frame = contentRect; | ||
| context.contentFrame = contentRect; | ||
|
|
||
| if (i == _currentPage) { | ||
| [self.currentDotStyle draw:context]; | ||
| } else { | ||
| [self.normalDotStyle draw:context]; | ||
| } | ||
| contentRect.origin.x += dotSize.width + boxStyle.margin.right; | ||
| } | ||
| } | ||
|
|
||
| - (CGSize)sizeThatFits:(CGSize)size { | ||
| TTStyleContext* context = [[[TTStyleContext alloc] init] autorelease]; | ||
| CGSize dotSize = [self.normalDotStyle addToSize:CGSizeZero context:context]; | ||
|
|
||
| CGFloat margin = 0; | ||
| TTBoxStyle* boxStyle = [self.normalDotStyle firstStyleOfClass:[TTBoxStyle class]]; | ||
| if (boxStyle) { | ||
| margin = boxStyle.margin.right + boxStyle.margin.left; | ||
| } | ||
|
|
||
| return CGSizeMake((dotSize.width * _numberOfPages) + (margin * (_numberOfPages-1)), | ||
| dotSize.height); | ||
| } | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| // UIControl | ||
|
|
||
| - (void)endTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)event { | ||
| if (self.touchInside) { | ||
| CGPoint point = [touch locationInView:self]; | ||
| self.currentPage = round(point.x / self.width); | ||
| [self sendActionsForControlEvents:UIControlEventValueChanged]; | ||
| } | ||
| } | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| // public | ||
|
|
||
| - (void)setNumberOfPages:(NSInteger)numberOfPages { | ||
| if (numberOfPages != _numberOfPages) { | ||
| _numberOfPages = numberOfPages; | ||
| [self setNeedsDisplay]; | ||
| } | ||
| } | ||
|
|
||
| - (void)setCurrentPage:(NSInteger)currentPage { | ||
| if (currentPage != _currentPage) { | ||
| _currentPage = currentPage; | ||
| [self setNeedsDisplay]; | ||
| } | ||
| } | ||
|
|
||
| - (void)setDotStyle:(NSString*)dotStyle { | ||
| if (![dotStyle isEqualToString:_dotStyle]) { | ||
| [_dotStyle release]; | ||
| _dotStyle = [dotStyle copy]; | ||
| TT_RELEASE_SAFELY(_normalDotStyle); | ||
| TT_RELEASE_SAFELY(_currentDotStyle); | ||
| } | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.