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

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

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index 4b4752d16913d2d700424dfec7a0e2178ae057fa..0e3dc6c6f79eeaa8f1f4d1562ffd56711d40f92b 100644 (file)
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -8,9 +8,10 @@
 #endif
 
 #include <plib/pu.h>
+#include <plib/sg.h>
 
 #include <simgear/compiler.h>  // for SG_USING_STD
-#include <simgear/misc/props.hxx>
+#include <simgear/props/props.hxx>
 
 #include <vector>
 SG_USING_STD(vector);
@@ -40,7 +41,7 @@ public:
      *
      * @param props A property tree describing the dialog.
      */
-    FGDialog (SGPropertyNode_ptr props);
+    FGDialog (SGPropertyNode * props);
 
 
     /**
@@ -91,13 +92,18 @@ public:
     virtual void applyValues ();
 
 
+    /**
+     * Update state.  Called on active dialogs before rendering.
+     */
+    virtual void update ();
+
 private:
 
     // Private copy constructor to avoid unpleasant surprises.
     FGDialog (const FGDialog &);
 
     // Show the dialog.
-    void display (SGPropertyNode_ptr props);
+    void display (SGPropertyNode * props);
 
     // Build the dialog or a subobject of it.
     puObject * makeObject (SGPropertyNode * props,
@@ -108,7 +114,8 @@ private:
 
     // Common configuration for all GUI group objects.
     void setupGroup (puGroup * group, SGPropertyNode * props,
-                     int width, int height, bool makeFrame = false);
+                     int width, int height, sgVec4 color,
+                     bool makeFrame = false);
 
     // The top-level PUI object.
     puObject * _object;
@@ -127,6 +134,7 @@ private:
         SGPropertyNode_ptr node;
     };
     vector<PropertyObject *> _propertyObjects;
+    vector<PropertyObject *> _liveObjects;
 
     // PUI doesn't copy arrays, so we have to allocate string arrays
     // and then keep pointers so that we can delete them when the
@@ -135,4 +143,24 @@ private:
     vector<char **> _char_arrays;
 };
 
+//
+// Custom subclass of puPopup to implement "draggable" windows in the
+// interface.  Note that this is a subclass of puPopup, not
+// puDialogBox.  Sadly, PUI (mis)uses subclassing to implement a
+// boolean property: modality.  That means that we can't implement
+// dragging of both puPopup windows and puDialogBoxes with the same
+// code.  Rather than duplicate code, I've chosen to implement only
+// "non-modal dragability" here.  Modal dialog boxes (like the exit
+// confirmation) are not draggable.
+//
+class fgPopup : public puPopup {
+public:
+    fgPopup(int x, int y) : puPopup(x, y) { _dragging = false; }
+    int checkHit(int b, int up, int x, int y);
+    int getHitObjects(puObject *, int x, int y);
+private:
+    bool _dragging;
+    int _dX, _dY;
+};
+
 #endif // __DIALOG_HXX