Skip to content

Commit

Permalink
updates to SimpleGuiToo to use new ofSetColor functions
Browse files Browse the repository at this point in the history
  • Loading branch information
Memo Akten authored and Memo Akten committed Nov 10, 2010
1 parent afbf62c commit 7c57385
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion MSAUtils/src/MSAUtils.mm
View file
Expand Up @@ -58,7 +58,7 @@ void drawFPS(int x, int y) {
void drawFPS(int color) {
ofSetRectMode(OF_RECTMODE_CORNER);
ofFill();
ofSetColor(color);
ofSetHexColor(color);
string fpsStr = "FPS: "+ofToString(ofGetFrameRate(), 2);
ofDrawBitmapString(fpsStr, 20, ofGetHeight()-20);
}
Expand Down
8 changes: 4 additions & 4 deletions ofxSimpleGuiToo/src/Controls/ofxSimpleGuiComboBox.cpp
View file
Expand Up @@ -192,13 +192,13 @@ void ofxSimpleGuiComboBox::releaseEventStealingFocus(){

//special overloads - this is a hack - later think about making ofxSimpleGuiControl's methods virtual.
void ofxSimpleGuiComboBox::setCBTextColor() {
if(m_hasFocus) ofSetColor(config->textOverColor);
else ofSetColor(config->textColor);
if(m_hasFocus) ofSetHexColor(config->textOverColor);
else ofSetHexColor(config->textColor);
}

void ofxSimpleGuiComboBox::setCBTextBGColor() {
if(m_hasFocus) ofSetColor(config->textBGOverColor);
else ofSetColor(config->textBGColor);
if(m_hasFocus) ofSetHexColor(config->textBGOverColor);
else ofSetHexColor(config->textBGColor);
}


Expand Down
2 changes: 1 addition & 1 deletion ofxSimpleGuiToo/src/Controls/ofxSimpleGuiContent.cpp
View file
Expand Up @@ -27,7 +27,7 @@ void ofxSimpleGuiContent::draw(float x, float y) {
glColor4f(0, 0, 0, 0.8f);
ofRect(0, 0, width, fixheight);

ofSetColor(0xffffff);
ofSetHexColor(0xffffff);
content->draw(0, 0, width, fixheight);

ofFill();
Expand Down
12 changes: 6 additions & 6 deletions ofxSimpleGuiToo/src/Controls/ofxSimpleGuiMovieSlider.h
View file
Expand Up @@ -130,28 +130,28 @@ class ofxSimpleGuiMovieSlider : public ofxSimpleGuiControl {
ofEnableAlphaBlending();
ofFill();
ofSetColor(255, 255, 255, 200);
// if(isMouseOver()) ofSetColor(config->overColor.r, config->overColor.g, config->overColor.b);
// if(focused && !isMouseOver()) ofSetColor(config->focusColor.r, config->focusColor.g, config->focusColor.b);
// if(isMouseOver()) ofSetHexColor(config->overColor.r, config->overColor.g, config->overColor.b);
// if(focused && !isMouseOver()) ofSetHexColor(config->focusColor.r, config->focusColor.g, config->focusColor.b);
ofRect(0, 0, width, height);
setFullColor();
ofRect(0, 0, barwidth, height);
ofSetColor(config->textBGColor);
ofSetHexColor(config->textBGColor);
ofRect(0, height, width, 20);
ofSetColor(config->textColor);
ofSetHexColor(config->textColor);
float inputpos = ofMap(input->getPosition(), 0.0, 1.0, 0.0, videoLength);
ostringstream info;
info << name << ":" << ofToString(inputpos, 3) << "/" << ofToString(videoLength, 3) << endl;
ofDrawBitmapString(info.str(), 3, height+15);
// cues
// if(cuePoint1 > 0.0) {
// ofSetColor(config->overColor.r, config->overColor.g, config->overColor.b, 200);
// ofSetHexColor(config->overColor.r, config->overColor.g, config->overColor.b, 200);
// ofRect(ofMap(cuePoint1, 0.0, 1.0, 0.0, width), 0, 1, height);
// }
// if(cuePoint2 < 1.0) {
// ofSetColor(config->overColor.r, config->overColor.g, config->overColor.b, 200);
// ofSetHexColor(config->overColor.r, config->overColor.g, config->overColor.b, 200);
// ofRect(ofMap(cuePoint2, 0.0, 1.0, 0.0, width), 0, 1, height);
// }
Expand Down
2 changes: 1 addition & 1 deletion ofxSimpleGuiToo/src/Controls/ofxSimpleGuiTitle.cpp
View file
Expand Up @@ -75,7 +75,7 @@ void ofxSimpleGuiTitle::draw(float x, float y) {
ofFill();
// setTextBGColor(value != NULL);
// ofSetColor(0, 0, 0);
ofSetColor(config->fullActiveColor);
ofSetHexColor(config->fullActiveColor);
ofRect(0, 0, width, height);

// if a toggle
Expand Down
20 changes: 10 additions & 10 deletions ofxSimpleGuiToo/src/ofxSimpleGuiControl.cpp
View file
Expand Up @@ -89,28 +89,28 @@ ofxSimpleGuiControl &ofxSimpleGuiControl::setKey(string newKey) {
}

ofxSimpleGuiControl &ofxSimpleGuiControl::setTextColor(bool clickable) {
if(isMouseOver() && clickable) ofSetColor(config->textOverColor);
else ofSetColor(config->textColor);
if(isMouseOver() && clickable) ofSetHexColor(config->textOverColor);
else ofSetHexColor(config->textColor);
return *this;
}

ofxSimpleGuiControl &ofxSimpleGuiControl::setTextBGColor(bool clickable) {
if(isMouseOver() && clickable) ofSetColor(config->textBGOverColor);
else ofSetColor(config->textBGColor);
if(isMouseOver() && clickable) ofSetHexColor(config->textBGOverColor);
else ofSetHexColor(config->textBGColor);
return *this;
}

ofxSimpleGuiControl &ofxSimpleGuiControl::setFullColor(bool forceActive) {
if(isMouseDown() || forceActive) ofSetColor(config->fullActiveColor);
else if(isMouseOver()) ofSetColor(config->fullOverColor);
else ofSetColor(config->fullColor);
if(isMouseDown() || forceActive) ofSetHexColor(config->fullActiveColor);
else if(isMouseOver()) ofSetHexColor(config->fullOverColor);
else ofSetHexColor(config->fullColor);
return *this;
}

ofxSimpleGuiControl &ofxSimpleGuiControl::setEmptyColor() {
ofSetColor(config->emptyColor);
// if(isMouseOver()) ofSetColor(config->overColor.r, config->overColor.g, config->overColor.b);
// if(focused && !isMouseOver()) ofSetColor(config->focusColor.r, config->focusColor.g, config->focusColor.b);
ofSetHexColor(config->emptyColor);
// if(isMouseOver()) ofSetHexColor(config->overColor.r, config->overColor.g, config->overColor.b);
// if(focused && !isMouseOver()) ofSetHexColor(config->focusColor.r, config->focusColor.g, config->focusColor.b);
return *this;
}

Expand Down
4 changes: 2 additions & 2 deletions ofxSimpleGuiToo/src/ofxSimpleGuiPage.cpp
View file
Expand Up @@ -134,7 +134,7 @@ void ofxSimpleGuiPage::draw(float x, float y, bool alignRight) {

if(control.hasTitle) {
ofNoFill();
ofSetColor(config->borderColor);
ofSetHexColor(config->borderColor);
glLineWidth(0.5f);
ofRect(controlX, controlY, control.width, control.height);
}
Expand All @@ -154,7 +154,7 @@ void ofxSimpleGuiPage::draw(float x, float y, bool alignRight) {
eventStealingControl->draw(stealingX, stealingY);
if(eventStealingControl->hasTitle) {
ofNoFill();
ofSetColor(config->borderColor);
ofSetHexColor(config->borderColor);
glLineWidth(0.5f);
ofRect(stealingX, stealingY, eventStealingControl->width, eventStealingControl->height);
}
Expand Down
4 changes: 2 additions & 2 deletions ofxSimpleGuiToo/src/ofxSimpleGuiToo.cpp
View file
Expand Up @@ -167,7 +167,7 @@ void ofxSimpleGuiToo::drawFocus(float x, float y) {
glPushMatrix();
glTranslatef(x, y, 0);
ofFill();
// ofSetColor(config->focusColor.r, config->focusColor.g, config->focusColor.b, 200);
// ofSetHexColor(config->focusColor.r, config->focusColor.g, config->focusColor.b, 200);
ofRect(0, 0, 10, 10);
glPopMatrix();
}
Expand All @@ -185,7 +185,7 @@ void ofxSimpleGuiToo::draw() {
glDisableClientState(GL_COLOR_ARRAY);

headerPage->draw(0, 0, alignRight); // this is the header
ofSetColor(config->borderColor);
ofSetHexColor(config->borderColor);
if(alignRight) ofLine(ofGetWidth() - headerPage->width, headerPage->height, headerPage->width, headerPage->height);
else ofLine(0, headerPage->height, headerPage->width, headerPage->height);
pages[currentPageIndex]->draw(0.0f, headerPage->height, alignRight);
Expand Down

0 comments on commit 7c57385

Please sign in to comment.