- abstract out reading colors from the property tree into a routine.

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

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index 2cb6f4ed16365ff4940c64368117d909991f97a9..d0c6d70b949fc2b8bbf2984bb7693ba04389d916 100644 (file)
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -8,9 +8,11 @@
 #endif
 
 #include <plib/pu.h>
+#include <plib/sg.h>
 
 #include <simgear/compiler.h>  // for SG_USING_STD
 #include <simgear/props/props.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <vector>
 SG_USING_STD(vector);
@@ -91,6 +93,11 @@ public:
     virtual void applyValues ();
 
 
+    /**
+     * Update state.  Called on active dialogs before rendering.
+     */
+    virtual void update ();
+
 private:
 
     // Private copy constructor to avoid unpleasant surprises.
@@ -108,7 +115,11 @@ 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);
+
+    // Read color properties and merge them into color vector.
+    void getColor(const SGPropertyNode * prop, sgVec4 color);
 
     // The top-level PUI object.
     puObject * _object;
@@ -127,12 +138,17 @@ 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
     // dialog closes.
     char ** make_char_array (int size);
     vector<char **> _char_arrays;
+
+    SGPath _font_path;
+    sgVec4 _fgcolor;
+    sgVec4 _bgcolor;
 };
 
 //
@@ -147,9 +163,11 @@ private:
 //
 class fgPopup : public puPopup {
 public:
-    fgPopup(int x, int y) : puPopup(x, y) { _dragging = false; }
+    fgPopup(int x, int y, bool d = true) : puPopup(x, y) { _dragging = false; _draggable = d;}
     int checkHit(int b, int up, int x, int y);
+    int getHitObjects(puObject *, int x, int y);
 private:
+    bool _draggable;
     bool _dragging;
     int _dX, _dY;
 };