Changeset 8583 in orxonox.OLD for branches/gui/src/lib/gui/gl/glgui_style.h

Timestamp:

Jun 19, 2006, 1:20:42 PM (19 years ago)

Author:

bensch

Message:

gui: using style.

File:

• branches/gui/src/lib/gui/gl/glgui_style.h (modified) (3 diffs)

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

@@ -26 +26 @@
 
 
-    /// Retrieve
+    /// Retrieve (ALL THESE FUNCTIONS ARE AGAIN IN THE GLGUI-WIDGET FOR EASY RETRIEVAL)
     /** @returns left borderWidth @param state the State to retrieve from */
     inline float borderLeft(OrxGui::State state = GLGUI_DEFAULT_STYLE) const { return _style[state]._borderLeft; }
@@ -40 +40 @@
     /** @returns the Background Color @param state the State to retrieve from */
     inline const Color& backgroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._background.diffuseColor(); }
+    /** @returns the Background Material. @param state the state to retrieve from */
+    inline const Material& background(OrxGui::State state = GLGUI_DEFAULT_STYLE) const { return _style[state]._background; }
     /** @returns background Texture. @param state the State to retrieve from */
-    inline const Texture& backgrorundTexture(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._background.diffuseTexture(); }
+    inline const Texture& backgroundTexture(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._background.diffuseTexture(); }
     /** @returns the foreground Color @param state the State to retrieve from */
     inline const Color& foregroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._foreground.diffuseColor(); }
+    /** @returns the ForeGroung Material. @param state the state to retrieve from */
+    inline const Material& foreground(OrxGui::State state = GLGUI_DEFAULT_STYLE) const { return _style[state]._foreground; }
 
     /** @returns FeaturePosition */
@@ -91 +95 @@
     void setForegroundColor(const Color& color, OrxGui::State state);
     void setForegroundColorS(float r, float g, float b, float a, const std::string& stateName);
+
+    inline Color& foregroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) { return _style[state]._foreground.diffuseColor(); }
+    inline Color& backgroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) { return _style[state]._background.diffuseColor(); }
+    inline Material& background(OrxGui::State state = GLGUI_DEFAULT_STYLE) { return _style[state]._background; }
+    inline Material& foreground(OrxGui::State state = GLGUI_DEFAULT_STYLE) { return _style[state]._foreground; }
 
     void loadBackgroundMaterial(const Material& material);