////////////////////////////////////////////////////////////////////////
FGDialog::FGDialog (SGPropertyNode * props)
- : _object(0)
+ : _object(0),
+ _gui((NewGUI *)globals->get_subsystem("gui"))
{
char* envp = ::getenv( "FG_FONTS" );
if ( envp != NULL ) {
_font_path.append( "Fonts" );
}
- const sgVec4 background = {0.8, 0.8, 0.9, 0.85};
- const sgVec4 foreground = {0, 0, 0, 1};
- sgCopyVec4(_bgcolor, background);
- sgCopyVec4(_fgcolor, foreground);
display(props);
}
// Let the layout widget work in the same property subtree.
LayoutWidget wid(props);
+ puFont *fnt = _gui->getDefaultFont();
+ wid.setDefaultFont(fnt, int(fnt->getPointSize()));
+
int pw=0, ph=0;
if(!userw || !userh)
wid.calcPrefSize(&pw, &ph);
puObject *
FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
{
+ if (props->getBoolValue("hide"))
+ return 0;
+
bool presetSize = props->hasValue("width") && props->hasValue("height");
int width = props->getIntValue("width", parentWidth);
int height = props->getIntValue("height", parentHeight);
int y = props->getIntValue("y", (parentHeight - height) / 2);
string type = props->getName();
- sgVec4 color;
-
- if (type == "hrule" || type == "vrule")
- sgCopyVec4(color, _fgcolor);
- else
- sgCopyVec4(color, _bgcolor);
-
- getColor(props->getNode("color"), color);
-
if (type == "")
type = "dialog";
if (type == "dialog") {
- puPopup * dialog;
+ puPopup * obj;
bool draggable = props->getBoolValue("draggable", true);
if (props->getBoolValue("modal", false))
- dialog = new puDialogBox(x, y);
+ obj = new puDialogBox(x, y);
else
- dialog = new fgPopup(x, y, draggable);
- setupGroup(dialog, props, width, height, color, true);
- return dialog;
+ obj = new fgPopup(x, y, draggable);
+ setupGroup(obj, props, width, height, true);
+ setColor(obj, props);
+ return obj;
+
} else if (type == "group") {
- puGroup * group = new puGroup(x, y);
- setupGroup(group, props, width, height, color, false);
- return group;
+ puGroup * obj = new puGroup(x, y);
+ setupGroup(obj, props, width, height, false);
+ setColor(obj, props);
+ return obj;
+
} else if (type == "frame") {
- puGroup * group = new puGroup(x, y);
- setupGroup(group, props, width, height, color, true);
- return group;
+ puGroup * obj = new puGroup(x, y);
+ setupGroup(obj, props, width, height, true);
+ setColor(obj, props);
+ return obj;
+
} else if (type == "hrule" || type == "vrule") {
- puFrame * rule = new puFrame(x, y, x + width, y + height);
- rule->setBorderThickness(0);
- rule->setColorScheme(color[0], color[1], color[2], color[3]);
- return rule;
+ puFrame * obj = new puFrame(x, y, x + width, y + height);
+ obj->setBorderThickness(0);
+ setColor(obj, props, BACKGROUND|FOREGROUND|HIGHLIGHT);
+ return obj;
+
} else if (type == "list") {
- puList * list = new puList(x, y, x + width, y + height);
- setupObject(list, props);
- return list;
+ puList * obj = new puList(x, y, x + width, y + height);
+ setupObject(obj, props);
+ setColor(obj, props);
+ return obj;
+
} else if (type == "airport-list") {
- AirportList * list = new AirportList(x, y, x + width, y + height);
- setupObject(list, props);
- return list;
+ AirportList * obj = new AirportList(x, y, x + width, y + height);
+ setupObject(obj, props);
+ setColor(obj, props);
+ return obj;
+
} else if (type == "input") {
- puInput * input = new puInput(x, y, x + width, y + height);
- setupObject(input, props);
- return input;
+ puInput * obj = new puInput(x, y, x + width, y + height);
+ setupObject(obj, props);
+ setColor(obj, props, FOREGROUND|LABEL);
+ return obj;
+
} else if (type == "text") {
- puText * text = new puText(x, y);
- setupObject(text, props);
+ puText * obj = new puText(x, y);
+ setupObject(obj, props);
if (props->getNode("format")) {
SGPropertyNode *live = props->getNode("live");
if (live && live->getBoolValue())
- text->setRenderCallback(format_callback, props);
+ obj->setRenderCallback(format_callback, props);
else
- format_callback(text, x, y, props);
+ format_callback(obj, x, y, props);
}
// Layed-out objects need their size set, and non-layout ones
// get a different placement.
- if(presetSize) text->setSize(width, height);
- else text->setLabelPlace(PUPLACE_LABEL_DEFAULT);
- return text;
+ if(presetSize) obj->setSize(width, height);
+ else obj->setLabelPlace(PUPLACE_LABEL_DEFAULT);
+ setColor(obj, props, LABEL);
+ return obj;
+
} else if (type == "checkbox") {
- puButton * b;
- b = new puButton(x, y, x + width, y + height, PUBUTTON_XCHECK);
- b->setColourScheme(.8, .7, .7); // matches "PUI input pink"
- setupObject(b, props);
- return b;
+ puButton * obj;
+ obj = new puButton(x, y, x + width, y + height, PUBUTTON_XCHECK);
+ setupObject(obj, props);
+ setColor(obj, props, FOREGROUND|LABEL);
+ return obj;
+
} else if (type == "radio") {
- puButton * b;
- b = new puButton(x, y, x + width, y + height, PUBUTTON_CIRCLE);
- b->setColourScheme(.8, .7, .7); // matches "PUI input pink"
- setupObject(b, props);
- return b;
+ puButton * obj;
+ obj = new puButton(x, y, x + width, y + height, PUBUTTON_CIRCLE);
+ setupObject(obj, props);
+ setColor(obj, props, FOREGROUND|LABEL);
+ return obj;
+
} else if (type == "button") {
- puButton * b;
+ puButton * obj;
const char * legend = props->getStringValue("legend", "[none]");
if (props->getBoolValue("one-shot", true))
- b = new puOneShot(x, y, legend);
+ obj = new puOneShot(x, y, legend);
else
- b = new puButton(x, y, legend);
+ obj = new puButton(x, y, legend);
if(presetSize)
- b->setSize(width, height);
- setupObject(b, props);
- return b;
+ obj->setSize(width, height);
+ setupObject(obj, props);
+ setColor(obj, props);
+ return obj;
+
} else if (type == "combo") {
vector<SGPropertyNode_ptr> value_nodes = props->getChildren("value");
char ** entries = make_char_array(value_nodes.size());
i < value_nodes.size();
i++, j--)
entries[i] = strdup((char *)value_nodes[i]->getStringValue());
- puComboBox * combo =
- new puComboBox(x, y, x + width, y + height, entries,
+ puComboBox * obj = new puComboBox(x, y, x + width, y + height, entries,
props->getBoolValue("editable", false));
- setupObject(combo, props);
- return combo;
+ setupObject(obj, props);
+ setColor(obj, props, FOREGROUND|LABEL);
+ return obj;
+
} else if (type == "slider") {
bool vertical = props->getBoolValue("vertical", false);
- puSlider * slider = new puSlider(x, y, (vertical ? height : width));
- slider->setMinValue(props->getFloatValue("min", 0.0));
- slider->setMaxValue(props->getFloatValue("max", 1.0));
- setupObject(slider, props);
+ puSlider * obj = new puSlider(x, y, (vertical ? height : width));
+ obj->setMinValue(props->getFloatValue("min", 0.0));
+ obj->setMaxValue(props->getFloatValue("max", 1.0));
+ setupObject(obj, props);
if(presetSize)
- slider->setSize(width, height);
- return slider;
+ obj->setSize(width, height);
+ setColor(obj, props, FOREGROUND|LABEL);
+ return obj;
+
} else if (type == "dial") {
- puDial * dial = new puDial(x, y, width);
- dial->setMinValue(props->getFloatValue("min", 0.0));
- dial->setMaxValue(props->getFloatValue("max", 1.0));
- dial->setWrap(props->getBoolValue("wrap", true));
- setupObject(dial, props);
- return dial;
+ puDial * obj = new puDial(x, y, width);
+ obj->setMinValue(props->getFloatValue("min", 0.0));
+ obj->setMaxValue(props->getFloatValue("max", 1.0));
+ obj->setWrap(props->getBoolValue("wrap", true));
+ setupObject(obj, props);
+ setColor(obj, props, FOREGROUND|LABEL);
+ return obj;
+
} else if (type == "textbox") {
- int slider_width = props->getIntValue("slider", parentHeight);
- int wrap = props->getBoolValue("wrap", true);
- if (slider_width==0) slider_width=20;
- puLargeInput * puTextBox =
- new puLargeInput(x, y, x+width, x+height, 2, slider_width, wrap);
- if (props->hasValue("editable"))
- {
- if (props->getBoolValue("editable")==false)
- puTextBox->disableInput();
- else
- puTextBox->enableInput();
- }
- setupObject(puTextBox,props);
- return puTextBox;
+ int slider_width = props->getIntValue("slider", parentHeight);
+ int wrap = props->getBoolValue("wrap", true);
+ if (slider_width==0) slider_width=20;
+ puLargeInput * obj = new puLargeInput(x, y,
+ x+width, x+height, 2, slider_width, wrap);
+
+ if (props->hasValue("editable")) {
+ if (props->getBoolValue("editable")==false)
+ obj->disableInput();
+ else
+ obj->enableInput();
+ }
+ setupObject(obj, props);
+ setColor(obj, props, FOREGROUND|LABEL);
+ return obj;
+
} else if (type == "select") {
vector<SGPropertyNode_ptr> value_nodes;
SGPropertyNode * selection_node =
i < value_nodes.size();
i++, j--)
entries[i] = strdup((char *)value_nodes[i]->getName());
- puSelectBox * select =
+ puSelectBox * obj =
new puSelectBox(x, y, x + width, y + height, entries);
- setupObject(select, props);
- return select;
+ setupObject(obj, props);
+ setColor(obj, props, FOREGROUND|LABEL);
+ return obj;
} else {
return 0;
}
object->setLabelFont( lfnt );
}
- sgVec4 color;
- sgCopyVec4(color, _fgcolor);
- getColor(props->getNode("color"), color);
- object->setColor(PUCOL_LABEL, color[0], color[1], color[2], color[3]);
-
if (props->hasValue("property")) {
const char * name = props->getStringValue("name");
if (name == 0)
void
FGDialog::setupGroup (puGroup * group, SGPropertyNode * props,
- int width, int height, sgVec4 color, bool makeFrame)
+ int width, int height, bool makeFrame)
{
setupObject(group, props);
if (makeFrame) {
puFrame* f = new puFrame(0, 0, width, height);
- f->setColorScheme(color[0], color[1], color[2], color[3]);
+ setColor(f, props);
}
int nChildren = props->nChildren();
}
void
-FGDialog::getColor (const SGPropertyNode * prop, sgVec4 color)
+FGDialog::setColor(puObject * object, SGPropertyNode * props, int which)
{
- if (!prop)
- return;
+ string type = props->getName();
+ if (type == "")
+ type = "dialog";
- const SGPropertyNode *p;
- if ((p = prop->getChild("red")))
- color[0] = p->getFloatValue();
- if ((p = prop->getChild("green")))
- color[1] = p->getFloatValue();
- if ((p = prop->getChild("blue")))
- color[2] = p->getFloatValue();
- if ((p = prop->getChild("alpha")))
- color[3] = p->getFloatValue();
+ FGColor *c = new FGColor(_gui->getColor("background"));
+ c->merge(_gui->getColor(type));
+ c->merge(props->getNode("color"));
+ if (c->isValid())
+ object->setColourScheme(c->red(), c->green(), c->blue(), c->alpha());
+
+ const int numcol = 6;
+ const struct {
+ int mask;
+ int id;
+ const char *name;
+ const char *cname;
+ } pucol[numcol] = {
+ { BACKGROUND, PUCOL_BACKGROUND, "background", "color-background" },
+ { FOREGROUND, PUCOL_FOREGROUND, "foreground", "color-foreground" },
+ { HIGHLIGHT, PUCOL_HIGHLIGHT, "highlight", "color-highlight" },
+ { LABEL, PUCOL_LABEL, "label", "color-label" },
+ { LEGEND, PUCOL_LEGEND, "legend", "color-legend" },
+ { MISC, PUCOL_MISC, "misc", "color-misc" }
+ };
+
+ for (int i = 0; i < numcol; i++) {
+ bool dirty = false;
+ c->clear();
+ c->setAlpha(1.0);
+
+ dirty |= c->merge(_gui->getColor(type + '-' + pucol[i].name));
+ if (which & pucol[i].mask)
+ dirty |= c->merge(props->getNode("color"));
+
+ if ((pucol[i].mask == LABEL) && !c->isValid())
+ dirty |= c->merge(_gui->getColor("label"));
+
+ if (c->isValid() && dirty)
+ object->setColor(pucol[i].id, c->red(), c->green(), c->blue(), c->alpha());
+ }
}
char **
projects / flightgear.git / blobdiff