Oliver Schroeder:

[flightgear.git] / src / GUI / dialog.cxx

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 3b2484150391344f7ca852462b2ee0a05dd6580e..7d1475bb9d7cbd11b4e94dd51ddc96d66c54e72a 100644 (file)
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -406,6 +406,9 @@ FGDialog::display (SGPropertyNode * props)
 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);
@@ -667,11 +670,14 @@ void
 FGDialog::setColor(puObject * object, SGPropertyNode * props, int which)
 {
     string type = props->getName();
-    FGColor c(_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());
+    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 {
@@ -680,28 +686,28 @@ FGDialog::setColor(puObject * object, SGPropertyNode * props, int which)
         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",
+        { 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);
+        c->clear();
+        c->setAlpha(1.0);
 
-        dirty |= c.merge(_gui->getColor(type + '-' + pucol[i].name));
+        dirty |= c->merge(_gui->getColor(type + '-' + pucol[i].name));
         if (which & pucol[i].mask)
-            dirty |= c.merge(props->getNode("color"));
+            dirty |= c->merge(props->getNode("color"));
 
-        if ((pucol[i].mask == LABEL) && !c.isValid())
-            dirty |= c.merge(_gui->getColor("label"));
+        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());
+        if (c->isValid() && dirty)
+            object->setColor(pucol[i].id, c->red(), c->green(), c->blue(), c->alpha());
     }
 }