diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
| commit | da77a5f25dbf9cdfbb33ddae1c01ed961f41374f (patch) | |
| tree | 7160c19d185fa8d0bf826c09c9346cdc8354e50d /src/gui/widgets/button.cpp | |
| parent | f0bf3996fbc2f9dc3edc55b45e4fa3a3a6275db4 (diff) | |
| parent | 3a447afa534573ed4a014372c687ef4028d16760 (diff) | |
| download | mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.gz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.bz2 mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.xz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/gui/widgets/button.cpp')
| -rw-r--r-- | src/gui/widgets/button.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 36a47859..aff46b2a 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -25,7 +25,7 @@ #include "graphics.h" #include "gui/palette.h" -#include "gui/skin.h" +#include "gui/theme.h" #include "resources/image.h" @@ -90,7 +90,7 @@ void Button::init() for (mode = 0; mode < BUTTON_COUNT; mode++) { - btn[mode] = SkinLoader::getImageFromTheme(data[mode].file); + btn[mode] = Theme::getImageFromTheme(data[mode].file); a = 0; for (y = 0; y < 3; y++) { @@ -126,7 +126,7 @@ Button::~Button() void Button::updateAlpha() { float alpha = std::max(config.getValue("guialpha", 0.8f), - (double)SkinLoader::instance()->getMinimumOpacity()); + (double) Theme::instance()->getMinimumOpacity()); if (mAlpha != alpha) { |