From 46087564d4184b28740b0c45c1bac199ab1942ec Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Mar 2014 14:14:29 +0300 Subject: Improve theme usage. Removed instance method. --- src/gui/widgets/listbox.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets/listbox.cpp') 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; -- cgit v1.2.3-60-g2f50