From 78ab7c7a2877efd245293ad00cd36bcaa8646507 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 5 Mar 2010 07:39:43 -0700 Subject: Rename SkinLoader to Theme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also merge the guialpha ConfigListener into Theme. Reviewed-by: Thorbjørn Lindeijer --- src/gui/widgets/window.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets/window.cpp') diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 83c918cf..b3d6bd02 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -26,7 +26,7 @@ #include "gui/gui.h" #include "gui/palette.h" -#include "gui/skin.h" +#include "gui/theme.h" #include "gui/viewport.h" #include "gui/widgets/layout.h" @@ -73,7 +73,7 @@ Window::Window(const std::string &caption, bool modal, Window *parent, setTitleBarHeight(20); // Loads the skin - mSkin = SkinLoader::instance()->load(skin, mDefaultSkinPath); + mSkin = Theme::instance()->load(skin, mDefaultSkinPath); // Add this window to the window container windowContainer->add(this); @@ -531,7 +531,7 @@ void Window::loadWindowState() if (skinName.compare(mSkin->getFilePath()) != 0) { mSkin->instances--; - mSkin = SkinLoader::instance()->load(skinName, mDefaultSkinPath); + mSkin = Theme::instance()->load(skinName, mDefaultSkinPath); } if (mGrip) @@ -709,7 +709,7 @@ int Window::getResizeHandles(gcn::MouseEvent &event) int Window::getGuiAlpha() { float alpha = std::max(config.getValue("guialpha", 0.8), - (double)SkinLoader::instance()->getMinimumOpacity()); + (double) Theme::instance()->getMinimumOpacity()); return (int) (alpha * 255.0f); } -- cgit v1.2.3-70-g09d2