{
int result = puPopup::checkHit(button, updown, x, y);
+ if ( !_draggable)
+ return result;
+
// This is annoying. We would really want a true result from the
// superclass to indicate "handled by child object", but all it
// tells us is that the pointer is inside the dialog. So do the
////////////////////////////////////////////////////////////////////////
FGDialog::FGDialog (SGPropertyNode * props)
- : _object(0)
+ : _object(0),
+ _gui((NewGUI *)globals->get_subsystem("gui"))
{
+ char* envp = ::getenv( "FG_FONTS" );
+ if ( envp != NULL ) {
+ _font_path.set( envp );
+ } else {
+ _font_path.set( globals->get_fg_root() );
+ _font_path.append( "Fonts" );
+ }
+
display(props);
}
bool userw = props->hasValue("width");
bool userh = props->hasValue("height");
+ // 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);
ph = props->getIntValue("height", ph);
int px = props->getIntValue("x", (screenw - pw) / 2);
int py = props->getIntValue("y", (screenh - ph) / 2);
+
+ // Define "x", "y", "width" and/or "height" in the property tree if they
+ // are not specified in the configuration file.
wid.layout(px, py, pw, ph);
+ // Use the dimension and location properties as specified in the
+ // configuration file or from the layout widget.
_object = makeObject(props, screenw, screenh);
// Remove automatically generated properties, so the layout looks
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 x = props->getIntValue("x", (parentWidth - width) / 2);
int y = props->getIntValue("y", (parentHeight - height) / 2);
-
- sgVec4 color = {0.8, 0.8, 0.9, 0.85};
- SGPropertyNode *ncs = props->getNode("color", false);
- if ( ncs ) {
- color[0] = ncs->getFloatValue("red", 0.8);
- color[1] = ncs->getFloatValue("green", 0.8);
- color[2] = ncs->getFloatValue("blue", 0.9);
- color[3] = ncs->getFloatValue("alpha", 0.85);
- }
-
string type = props->getName();
+
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);
- 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 * obj = new puGroup(x, y);
+ setupGroup(obj, props, width, height, true);
+ setColor(obj, props);
+ return obj;
+
+ } else if (type == "hrule" || type == "vrule") {
+ 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);
- if (slider_width==0) slider_width=20;
- puLargeInput * puTextBox =
- new puLargeInput(x, y, x+width, x+height, 2, slider_width);
- 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;
}
if (props->hasValue("label"))
object->setLabel(props->getStringValue("label"));
+ if (props->hasValue("border"))
+ object->setBorderThickness( props->getIntValue("border", 2) );
+
+ if ( SGPropertyNode *nft = props->getNode("font", false) ) {
+ SGPath path( _font_path );
+ const char *name = nft->getStringValue("name", "default");
+ float size = nft->getFloatValue("size", 13.0);
+ float slant = nft->getFloatValue("slant", 0.0);
+ path.append( name );
+ path.concat( ".txf" );
+
+ fntFont *font = new fntTexFont;
+ font->load( (char *)path.c_str() );
+
+ puFont lfnt(font, size, slant);
+ object->setLabelFont( lfnt );
+ }
+
if (props->hasValue("property")) {
const char * name = props->getStringValue("name");
if (name == 0)
_liveObjects.push_back(po);
}
- vector<SGPropertyNode_ptr> nodes = props->getChildren("binding");
- if (nodes.size() > 0) {
+ SGPropertyNode * dest = fgGetNode("/sim/bindings/gui", true);
+ vector<SGPropertyNode_ptr> bindings = props->getChildren("binding");
+ if (bindings.size() > 0) {
GUIInfo * info = new GUIInfo(this);
- for (unsigned int i = 0; i < nodes.size(); i++)
- info->bindings.push_back(new FGBinding(nodes[i]));
+ for (unsigned int i = 0; i < bindings.size(); i++) {
+ unsigned int j = 0;
+ SGPropertyNode *binding;
+ while (dest->getChild("binding", j))
+ j++;
+
+ binding = dest->getChild("binding", j, true);
+ copyProperties(bindings[i], binding);
+ info->bindings.push_back(new FGBinding(binding));
+ }
object->setCallback(action_callback);
object->setUserData(info);
_info.push_back(info);
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();
group->close();
}
+void
+FGDialog::setColor(puObject * object, SGPropertyNode * props, int which)
+{
+ string type = props->getName();
+ if (type == "")
+ type = "dialog";
+
+ 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 **
FGDialog::make_char_array (int size)
{
projects / flightgear.git / blobdiff