- 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 0e3dc6c6f79eeaa8f1f4d1562ffd56711d40f92b..d0c6d70b949fc2b8bbf2984bb7693ba04389d916 100644 (file)
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -12,6 +12,7 @@
 
 #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);
@@ -117,6 +118,9 @@ private:
                      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;
 
@@ -141,6 +145,10 @@ private:
     // dialog closes.
     char ** make_char_array (int size);
     vector<char **> _char_arrays;
+
+    SGPath _font_path;
+    sgVec4 _fgcolor;
+    sgVec4 _bgcolor;
 };
 
 //
@@ -155,10 +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;
 };