summaryrefslogtreecommitdiff
path: root/src/gui/widgets/slider.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/slider.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/slider.cpp')
-rw-r--r--src/gui/widgets/slider.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index af36518a..6a9a5c7c 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -24,7 +24,7 @@
#include "configuration.h"
#include "graphics.h"
-#include "gui/skin.h"
+#include "gui/theme.h"
#include "resources/image.h"
@@ -82,8 +82,8 @@ void Slider::init()
// Load resources
if (mInstances == 0)
{
- Image *slider = SkinLoader::getImageFromTheme("slider.png");
- Image *sliderHi = SkinLoader::getImageFromTheme("slider_hilight.png");
+ Image *slider = Theme::getImageFromTheme("slider.png");
+ Image *sliderHi = Theme::getImageFromTheme("slider_hilight.png");
x = 0; y = 0;
w = 15; h = 6;
@@ -127,7 +127,7 @@ void Slider::init()
void Slider::updateAlpha()
{
float alpha = std::max(config.getValue("guialpha", 0.8),
- (double)SkinLoader::instance()->getMinimumOpacity());
+ (double) Theme::instance()->getMinimumOpacity());
if (alpha != mAlpha)
{