Changeset 8440 in orxonox.OLD

Timestamp:

Jun 15, 2006, 2:12:06 AM (18 years ago)

Author:

bensch

Message:

gui_style: go on with the work… this will be heavy

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_style.h (modified) (1 diff)
• glgui_widget.h (modified) (2 diffs)

branches/gui/src/lib/gui/gl/glgui_style.h

@@ -35 +35 @@
 
   private:
-    float             _borderLeft;           //!< The Distance to the left Border of the widget, before any internal Element starts.
-    float             _borderRight;          //!< The Distance to the right Border of the widget, before any internal Element starts.
-    float             _borderTop;            //!< The Distance to the top Border of the widget, before any internal Element starts
-    float             _borderBottom;         //!< The Distance to the bottom Border of the widget, before any internal Element starts
+    typedef struct
+    {
+      float             _borderLeft;           //!< The Distance to the left Border of the widget, before any internal Element starts.
+      float             _borderRight;          //!< The Distance to the right Border of the widget, before any internal Element starts.
+      float             _borderTop;            //!< The Distance to the top Border of the widget, before any internal Element starts
+      float             _borderBottom;         //!< The Distance to the bottom Border of the widget, before any internal Element starts
 
-    Font*             _font;                 //!< The Font used in the current Widget.
-    float             _textSize;             //!< The TextSize of the Widget.
-    float             _textColor;            //!< The TextColor of the Widget.
+      float             _textSize;             //!< The TextSize of the Widget.
 
-    float             _backgroundColor;      //!< The BackgroundColor of the Widget.
-    Texture           _backgorundTexture;    //!< The BackgroundTexture of the Widget.
+      Color             _backgroundColor;      //!< The BackgroundColor of the Widget.
+      Texture           _backgorundTexture;    //!< The BackgroundTexture of the Widget.
 
-    float             _foregroundColor;      //!< The foregroundColor of the Widget.
-    Texture           _foregorundTexture;    //!< The ForegroundTexture of the Widget
+      Color             _foregroundColor;      //!< The foregroundColor of the Widget.
+    }
+    StatedStyle;
+
+    StatedStyle      _style[4];
 
     FeaturePosition   _featurePosition;      //!< The Position a Feature will be layed at (checkbox(box), slider(text),...)
+    Font*             _font;                 //!< The Font used in the current Widget.
+
 
     bool              _animated;             //!< If the Widget is animated (Texture might be an AnimatedTexture.)

branches/gui/src/lib/gui/gl/glgui_widget.h

@@ -8 +8 @@
 
 #include "element_2d.h"
+
+#include "glgui_style.h"
+#include "material.h"
 #include "rect2D.h"
-
-#include "material.h"
 
 #include "event.h"
 #include "signal_connector.h"
-
-#include "glincl.h"
-
-#include <vector>
-
-// FORWARD DECLARATION
-class Material;
 
 namespace OrxGui
@@ -173 +167 @@
     Vector2D                       _minSize;
 
+    GLGuiStyle                     _style;
+
     /// EVENTS
     bool                           _focusable;        //!< If this widget can receive focus.