diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-05 07:39:43 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-05 07:58:02 -0700 |
| commit | 78ab7c7a2877efd245293ad00cd36bcaa8646507 (patch) | |
| tree | 28ea749d784a3dbee334f6a076a7ac77bc0333e1 /src/gui/widgets/dropdown.cpp | |
| parent | b60e6d82d6e843f9e65c81555ec281d237c3ce41 (diff) | |
| download | mana-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/dropdown.cpp')
| -rw-r--r-- | src/gui/widgets/dropdown.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index eb0cdef2..57a09ed2 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -26,7 +26,7 @@ #include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/skin.h" +#include "gui/theme.h" #include "gui/widgets/listbox.h" #include "gui/widgets/scrollarea.h" @@ -55,14 +55,10 @@ DropDown::DropDown(gcn::ListModel *listModel): // Load the background skin // Get the button skin - buttons[1][0] = - SkinLoader::getImageFromTheme("vscroll_up_default.png"); - buttons[0][0] = - SkinLoader::getImageFromTheme("vscroll_down_default.png"); - buttons[1][1] = - SkinLoader::getImageFromTheme("vscroll_up_pressed.png"); - buttons[0][1] = - SkinLoader::getImageFromTheme("vscroll_down_pressed.png"); + buttons[1][0] = Theme::getImageFromTheme("vscroll_up_default.png"); + buttons[0][0] = Theme::getImageFromTheme("vscroll_down_default.png"); + buttons[1][1] = Theme::getImageFromTheme("vscroll_up_pressed.png"); + buttons[0][1] = Theme::getImageFromTheme("vscroll_down_pressed.png"); buttons[0][0]->setAlpha(mAlpha); buttons[0][1]->setAlpha(mAlpha); @@ -70,7 +66,7 @@ DropDown::DropDown(gcn::ListModel *listModel): buttons[1][1]->setAlpha(mAlpha); // get the border skin - Image *boxBorder = SkinLoader::getImageFromTheme("deepbox.png"); + Image *boxBorder = Theme::getImageFromTheme("deepbox.png"); int gridx[4] = {0, 3, 28, 31}; int gridy[4] = {0, 3, 28, 31}; int a = 0, x, y; @@ -115,7 +111,7 @@ DropDown::~DropDown() void DropDown::updateAlpha() { float alpha = std::max(config.getValue("guialpha", 0.8f), - (double)SkinLoader::instance()->getMinimumOpacity()); + (double) Theme::instance()->getMinimumOpacity()); if (mAlpha != alpha) { |