diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-16 14:14:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-16 14:14:29 +0300 |
| commit | 46087564d4184b28740b0c45c1bac199ab1942ec (patch) | |
| tree | 0591b36aba2ae392eb569828930f030850cbc769 /src/gui/widgets/listbox.cpp | |
| parent | cf9b1182f06b1336f0d1071c267ea36c990430fa (diff) | |
| download | manaverse-46087564d4184b28740b0c45c1bac199ab1942ec.tar.gz manaverse-46087564d4184b28740b0c45c1bac199ab1942ec.tar.bz2 manaverse-46087564d4184b28740b0c45c1bac199ab1942ec.tar.xz manaverse-46087564d4184b28740b0c45c1bac199ab1942ec.zip | |
Improve theme usage.
Removed instance method.
Diffstat (limited to 'src/gui/widgets/listbox.cpp')
| -rw-r--r-- | src/gui/widgets/listbox.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 6f0c192c6..f2a23253e 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -111,7 +111,6 @@ ListBox::ListBox(const Widget2 *const widget, mForegroundColor = getThemeColor(Theme::LISTBOX); mForegroundColor2 = getThemeColor(Theme::LISTBOX_OUTLINE); - Theme *const theme = Theme::instance(); if (theme) mSkin = theme->load(skin, "listbox.xml"); @@ -138,14 +137,14 @@ ListBox::~ListBox() if (gui) gui->removeDragged(this); - if (Theme::instance()) - Theme::instance()->unload(mSkin); + if (theme) + theme->unload(mSkin); } void ListBox::updateAlpha() { const float alpha = std::max(client->getGuiAlpha(), - Theme::instance()->getMinimumOpacity()); + theme->getMinimumOpacity()); if (mAlpha != alpha) mAlpha = alpha; |