-
Notifications
You must be signed in to change notification settings - Fork 140
Add triangle position, type and size customization options #26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
XBeg9
wants to merge
1
commit into
TomThorpe:master
Choose a base branch
from
XBeg9:triangle_position
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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,24 @@ | ||
| // | ||
| // TTTriangle.h | ||
| // UIScrollSlidingPages | ||
| // | ||
| // Created by Thomas Thorpe on 16/04/2013. | ||
| // Copyright (c) 2013 Thomas Thorpe. All rights reserved. | ||
| // | ||
|
|
||
| #import <UIKit/UIKit.h> | ||
|
|
||
| typedef NS_ENUM(NSInteger, TTTriangleType) { | ||
| TTTriangleTypeTop = 1, | ||
| TTTriangleTypeBottom = 2, | ||
| }; | ||
|
|
||
| @interface TTTriangle : UIView | ||
|
|
||
| @property (nonatomic, strong, readwrite) UIColor *color; | ||
| @property (nonatomic, assign, readwrite) TTTriangleType type; | ||
|
|
||
| - (id)initWithFrame:(CGRect)frame color:(UIColor *)sColor; | ||
| - (id)initWithFrame:(CGRect)frame color:(UIColor *)sColor type:(TTTriangleType)type; | ||
|
|
||
| @end |
This file contains hidden or 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,71 @@ | ||
| // | ||
| // TTTriangle.m | ||
| // UIScrollSlidingPages | ||
| // | ||
| // Created by Thomas Thorpe on 16/04/2013. | ||
| // Copyright (c) 2013 Thomas Thorpe. All rights reserved. | ||
| // | ||
|
|
||
| #import "TTTriangle.h" | ||
|
|
||
| @implementation TTTriangle | ||
|
|
||
| - (id)initWithFrame:(CGRect)frame color:(UIColor *)sColor type:(TTTriangleType)type { | ||
| self = [super initWithFrame:frame]; | ||
| if (self) { | ||
| _color = sColor; | ||
| _type = type; | ||
| self.backgroundColor = [UIColor clearColor]; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (id)initWithFrame:(CGRect)frame color:(UIColor *)sColor | ||
| { | ||
| return [self initWithFrame:frame color:sColor type:TTTriangleTypeTop]; | ||
| } | ||
|
|
||
| - (id)initWithFrame:(CGRect)frame | ||
| { | ||
| return [self initWithFrame:frame color:[UIColor whiteColor] type:TTTriangleTypeTop]; | ||
| } | ||
|
|
||
| #pragma mark - Setters / Getters | ||
|
|
||
| - (void)setColor:(UIColor *)color { | ||
| _color = color; | ||
|
|
||
| [self setNeedsDisplay]; | ||
| } | ||
|
|
||
| - (void)setType:(TTTriangleType)type { | ||
| _type = type; | ||
|
|
||
| [self setNeedsDisplay]; | ||
| } | ||
|
|
||
| #pragma mark - Drawing | ||
|
|
||
| -(void)drawRect:(CGRect)rect | ||
| { | ||
| CGContextRef ctx = UIGraphicsGetCurrentContext(); | ||
|
|
||
| CGContextClearRect(ctx, rect); | ||
|
|
||
| CGContextBeginPath(ctx); | ||
| if (_type == TTTriangleTypeTop) { | ||
| CGContextMoveToPoint (ctx, CGRectGetMinX(rect), CGRectGetMinY(rect)); // top left | ||
| CGContextAddLineToPoint(ctx, CGRectGetMaxX(rect), CGRectGetMinY(rect)); // top right | ||
| CGContextAddLineToPoint(ctx, CGRectGetMidX(rect), CGRectGetMaxY(rect)); // mid bottom | ||
| } else if (_type == TTTriangleTypeBottom) { | ||
| CGContextMoveToPoint(ctx, CGRectGetMidX(rect), CGRectGetMinY(rect)); | ||
| CGContextAddLineToPoint(ctx, CGRectGetMinX(rect), CGRectGetMaxY(rect)); | ||
| CGContextAddLineToPoint(ctx, CGRectGetMaxX(rect), CGRectGetMaxY(rect)); | ||
| } | ||
| CGContextClosePath(ctx); | ||
|
|
||
| CGContextSetFillColorWithColor(ctx, _color.CGColor); | ||
| CGContextFillPath(ctx); | ||
| } | ||
|
|
||
| @end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't work for me, the triangle's frame Y value is incorrect, and works better with the following: