summaryrefslogtreecommitdiff
path: root/src/gui/widgets/button.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-05 07:39:43 -0700
committerJared Adams <jaxad0127@gmail.com>2010-03-05 07:58:02 -0700
commit78ab7c7a2877efd245293ad00cd36bcaa8646507 (patch)
tree28ea749d784a3dbee334f6a076a7ac77bc0333e1 /src/gui/widgets/button.cpp
parentb60e6d82d6e843f9e65c81555ec281d237c3ce41 (diff)
downloadmana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.gz
mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.bz2
mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.xz
mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.zip
Rename SkinLoader to Theme
Also merge the guialpha ConfigListener into Theme. Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/gui/widgets/button.cpp')
-rw-r--r--src/gui/widgets/button.cpp6
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)
{