Merge pull request #4 from adamjuhasz/master

strokeColor is cached when changing drawingColor, affecting first points
IFTTT · Jun 21, 2015 · 175ee54 · 175ee54
2 parents 7532036 + 2d9a7d6
commit 175ee54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Example/jot/ExampleViewController.m b/Example/jot/ExampleViewController.m
@@ -158,6 +158,7 @@ - (void)toggleDrawingButtonAction
 
     } else if (self.jotViewController.state == JotViewStateText) {
         self.jotViewController.state = JotViewStateDrawing;
+        self.jotViewController.drawingColor = [UIColor colorWithRed:((double)arc4random()/UINT32_MAX) green:((double)arc4random()/UINT32_MAX) blue:((double)arc4random()/UINT32_MAX) alpha:1.0];
         [self.toggleDrawingButton setTitle:kTextImageName forState:UIControlStateNormal];
     }
 }

diff --git a/jot/JotDrawView.m b/jot/JotDrawView.m
@@ -192,6 +192,12 @@ - (CGFloat)strokeWidthForVelocity:(CGFloat)velocity
     return self.strokeWidth - ((self.strokeWidth * (1.f - kJotRelativeMinStrokeWidth)) / (1.f + (CGFloat)pow((double)M_E, (double)(-((velocity - self.initialVelocity) / self.initialVelocity)))));
 }
 
+- (void)setStrokeColor:(UIColor *)strokeColor
+{
+    _strokeColor = strokeColor;
+    self.bezierPath = nil;
+}
+
 - (JotTouchBezier *)bezierPath
 {
     if (!_bezierPath) {