Skip to content

typo here. #1

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.

Sign up for GitHub

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
demonnico wants to merge 1 commit into
base: master
Choose a base branch
from
Open

typo here. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Pod/Classes/EUMShowTouchWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@property(nonatomic,strong) UIImage *imgViewPointer;
@property(nonatomic,assign) CGSize pointerSize;
@property(nonatomic,strong) UIColor *pointerColor;
@property(nonatomic,strong) UIColor *pointerStockColor;
@property(nonatomic,strong) UIColor *pointerStockColor NS_DEPRECATED_IOS(2_0,3_0, "typo here");
@property(nonatomic,strong) UIColor *pointerStrokeColor;

@end
12 changes: 11 additions & 1 deletion Pod/Classes/EUMShowTouchWindow.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ -(CGSize)pointerSize{
return _pointerSize;
}

-(void)setPointerStockColor:(UIColor *)pointerStockColor
{
self.pointerStrokeColor = pointerStockColor;
}

-(UIColor*)pointerStockColor
{
return _pointerStrokeColor;
}

- (void)sendEvent:(UIEvent *)event
{
[super sendEvent:event];
Expand All @@ -45,7 +55,7 @@ - (void)sendEvent:(UIEvent *)event
EUMTouchPointView *touchPointerView = [[EUMTouchPointView alloc] initWithFrame:CGRectMake(point.x-self.pointerSize.width/2 ,point.y-self.pointerSize.height/2, self.pointerSize.width, self.pointerSize.height)];
touchPointerView.contentMode = UIViewContentModeRedraw;
touchPointerView.pointerColor = self.pointerColor;
touchPointerView.pointerStockColor = self.pointerStockColor;
touchPointerView.pointerStrokeColor = self.pointerStrokeColor;
[self addSubview:touchPointerView];
touch.viewTouchPointer = touchPointerView;
touchPointerView.transform = CGAffineTransformMakeScale(kStartScale, kStartScale);
Expand Down
3 changes: 2 additions & 1 deletion Pod/Classes/EUMTouchPointView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
@interface EUMTouchPointView : UIView

@property(nonatomic,strong) UIColor *pointerColor;
@property(nonatomic,strong) UIColor *pointerStockColor;
@property(nonatomic,strong) UIColor *pointerStockColor NS_DEPRECATED_IOS(2_0,3_0, "typo here");
@property(nonatomic,strong) UIColor *pointerStrokeColor;
@end
18 changes: 14 additions & 4 deletions Pod/Classes/EUMTouchPointView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,21 @@ -(instancetype)initWithFrame:(CGRect)frame{
-(void)drawRect:(CGRect)rect{

CGRect frm = self.frame;
[self drawPointer:frm.size stockWidth:3];
[self drawPointer:frm.size strokeWidth:3];

}

- (void)drawPointer: (CGSize)pointSize stockWidth: (CGFloat)stockWidth
-(void)setPointerStockColor:(UIColor *)pointerStockColor
{
self.pointerStrokeColor = pointerStockColor;
}

-(UIColor*)pointerStockColor
{
return _pointerStrokeColor;
}

- (void)drawPointer: (CGSize)pointSize strokeWidth: (CGFloat)stockWidth
{

//// General Declarations
Expand All @@ -50,8 +60,8 @@ - (void)drawPointer: (CGSize)pointSize stockWidth: (CGFloat)stockWidth
CGContextSaveGState(context);
CGContextSetShadowWithColor(context, shadowOffset, shadowBlurRadius, [shadow CGColor]);

if (self.pointerStockColor) {
[self.pointerStockColor setStroke];
if (self.pointerStrokeColor) {
[self.pointerStrokeColor setStroke];
}else{
[UIColor.whiteColor setStroke];
}
Expand Down