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/slider.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/slider.cpp')
| -rw-r--r-- | src/gui/widgets/slider.cpp | 8 |
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) { |