Melchior: Make line wrapping in textboxes configurable, and enable it by default

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

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 4cac703b1ba67e4087e03256f555d610ca3262f8..e67f972eaae4ed86660039e345ac17ac192a0899 100644 (file)
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -101,7 +101,7 @@ format_callback(puObject *obj, int dx, int dy, void *n)
 {
     SGPropertyNode *node = (SGPropertyNode *)n;
     const char *format = node->getStringValue("format"), *f = format;
-    bool number;
+    bool number, l = false;
     // make sure the format matches '[ -+#]?\d*(\.\d*)?l?[fs]'
     for (; *f; f++) {
         if (*f == '%') {
@@ -123,13 +123,15 @@ format_callback(puObject *obj, int dx, int dy, void *n)
             f++;
     }
     if (*f == 'l')
-        f++;
+        l = true, f++;
 
     if (*f == 'f')
         number = true;
-    else if (*f == 's')
+    else if (*f == 's') {
+        if (l)
+            return;
         number = false;
-    else
+    } else
         return;
 
     for (++f; *f; f++) {
@@ -141,13 +143,11 @@ format_callback(puObject *obj, int dx, int dy, void *n)
         }
     }
 
-    char buf[256], *end;
+    char buf[256];
     const char *src = obj->getLabel();
 
     if (number) {
         float value = atof(src);
-        if (end == src)
-            return;    // not a number
         snprintf(buf, 256, format, value);
     } else {
         snprintf(buf, 256, format, src);
@@ -390,6 +390,15 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int 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";
@@ -400,11 +409,11 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
             dialog = new puDialogBox(x, y);
         else
             dialog = new fgPopup(x, y);
-        setupGroup(dialog, props, width, height, true);
+        setupGroup(dialog, props, width, height, color, true);
         return dialog;
     } else if (type == "group") {
         puGroup * group = new puGroup(x, y);
-        setupGroup(group, props, width, height, false);
+        setupGroup(group, props, width, height, color, false);
         return group;
     } else if (type == "list") {
         puList * list = new puList(x, y, x + width, y + height);
@@ -422,8 +431,13 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
         puText * text = new puText(x, y);
         setupObject(text, props);
 
-        if (props->getNode("format"))
-            text->setRenderCallback(format_callback, props);
+        if (props->getNode("format")) {
+            SGPropertyNode *live = props->getNode("live");
+            if (live && live->getBoolValue())
+                text->setRenderCallback(format_callback, props);
+            else
+                format_callback(text, x, y, props);
+        }
         // Layed-out objects need their size set, and non-layout ones
         // get a different placement.
         if(presetSize) text->setSize(width, height);
@@ -482,9 +496,10 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
         return dial;
     } else if (type == "textbox") {
        int slider_width = props->getIntValue("slider", parentHeight);
+       int wrap = props->getBoolValue("wrap", true)==true;
        if (slider_width==0) slider_width=20;
        puLargeInput * puTextBox =
-                     new puLargeInput(x, y, x+width, x+height, 2, slider_width);
+                     new puLargeInput(x, y, x+width, x+height, 2, slider_width, wrap);
        if  (props->hasValue("editable"))
        {
           if (props->getBoolValue("editable")==false)
@@ -556,13 +571,13 @@ FGDialog::setupObject (puObject * object, SGPropertyNode * props)
 
 void
 FGDialog::setupGroup (puGroup * group, SGPropertyNode * props,
-                    int width, int height, bool makeFrame)
+                    int width, int height, sgVec4 color, bool makeFrame)
 {
     setupObject(group, props);
 
     if (makeFrame) {
         puFrame* f = new puFrame(0, 0, width, height);
-        f->setColorScheme(0.8, 0.8, 0.9, 0.85);
+        f->setColorScheme(color[0], color[1], color[2], color[3]);
     }
 
     int nChildren = props->nChildren();