Skip to content

Color picker dropdown update #87

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
thomwolf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Color picker dropdown update #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d965bd
Minor change to Colorpicker setColor to update vbo ColorData as well
thomwolf Jul 13, 2016
deea0af
Added setOptions to Dropdown
thomwolf Jul 13, 2016
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
11 changes: 7 additions & 4 deletions src/components/ofxDatGuiColorPicker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,21 @@ class ofxDatGuiColorPicker : public ofxDatGuiTextInput {
{
mColor = color;
setTextFieldInputColor();
gColors[2] = mColor;
gColors[0] = ofColor(mColor.r/2, mColor.g/2, mColor.b/2);
vbo.setColorData(&gColors[0], 6, GL_DYNAMIC_DRAW );
}

void setColor(int hex)
{
mColor = ofColor::fromHex(hex);
setTextFieldInputColor();
setColor(mColor);
}

void setColor(int r, int g, int b, int a = 255)
{
mColor = ofColor(r, g, b, a);
setTextFieldInputColor();
setColor(mColor);
}

ofColor getColor()
Expand Down
12 changes: 12 additions & 0 deletions src/components/ofxDatGuiGroups.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,18 @@ class ofxDatGuiDropdown : public ofxDatGuiGroup {
return children.size();
}

void setOptions(const vector<string>& options = vector<string>())
{
mOption = 0;
children.clear();
for(int i=0; i<options.size(); i++){
ofxDatGuiDropdownOption* opt = new ofxDatGuiDropdownOption(options[i]);
opt->setIndex(children.size());
opt->onButtonEvent(this, &ofxDatGuiDropdown::onOptionSelected);
children.push_back(opt);
}
}

ofxDatGuiDropdownOption* getChildAt(int index)
{
return static_cast<ofxDatGuiDropdownOption*>(children[index]);
Expand Down