Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Entropy/ofxTimeline
Browse files Browse the repository at this point in the history
  • Loading branch information
prisonerjohn committed Apr 21, 2017
2 parents 11081d9 + ca93177 commit fe8811c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/ofxTLTicker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void ofxTLTicker::draw(){
refreshTickMarks();
}

tickerMarks.setStrokeColor( ofColor(200, 180, 40) );
tickerMarks.setStrokeColor(timeline->getColors().outlineColor);
tickerMarks.setStrokeWidth(1);
tickerMarks.draw(0, bounds.y);

Expand Down Expand Up @@ -148,7 +148,7 @@ void ofxTLTicker::draw(){
ofDrawLine(currentFrameX, totalDrawRect.y, currentFrameX, totalDrawRect.y+totalDrawRect.height);
//draw bounds
ofNoFill();
ofSetColor(200, 180, 40);
ofSetColor(timeline->getColors().outlineColor);
ofDrawRectangle(bounds);

ofPopStyle();
Expand Down

0 comments on commit fe8811c

Please sign in to comment.