Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 18, 2006, 11:01:40 PM (19 years ago)
Author:
bensch
Message:

gui: better names

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/gui/src/lib/gui/gl/glgui_style.h

    r8559 r8575  
    1111#include "glgui_defs.h"
    1212
     13#include "material.h"
    1314#include "font.h"
    1415#include "texture.h"
     
    3435    /** @returns bottom borderWidth @param state the State to retrieve from */
    3536    inline float borderBottom(OrxGui::State state = GLGUI_DEFAULT_STYLE) const { return _style[state]._borderBottom; }
     37
    3638    /** @returns textSize @param state the State to retrieve from */
    3739    inline float textSize(OrxGui::State state = GLGUI_DEFAULT_STYLE) const { return _style[state]._textSize; }
    3840    /** @returns the Background Color @param state the State to retrieve from */
    39     inline const Color& backgroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._backgroundColor; }
     41    inline const Color& backgroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._background.diffuseColor(); }
    4042    /** @returns background Texture. @param state the State to retrieve from */
    41     inline const Texture& backgrorundTexture(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._backgroundTexture; }
     43    inline const Texture& backgrorundTexture(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._background.diffuseTexture(); }
    4244    /** @returns the foreground Color @param state the State to retrieve from */
    43     inline const Color& foregroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._foregroundColor; }
     45    inline const Color& foregroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) const { return _style[state]._foreground.diffuseColor(); }
    4446
    4547    /** @returns FeaturePosition */
     
    113115      float             _textSize;             //!< The TextSize of the Widget.
    114116
    115       Color             _backgroundColor;      //!< The BackgroundColor of the Widget.
    116       Texture           _backgroundTexture;    //!< The BackgroundTexture of the Widget.
     117      Material          _background;           //!< The Background Material of the Widget.
    117118
    118       Color             _foregroundColor;      //!< The foregroundColor of the Widget.
     119      Material          _foreground;           //!< The foreground Material of the Widget.
    119120    }
    120121    StatedStyle;
Note: See TracChangeset for help on using the changeset viewer.