From ff11053f5f638749c3564c464dc41ebc474b4897 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 9 Jun 2012 22:46:34 +0300 Subject: Move static methods from Image class to ImageHelper class. Remove SDL merge method. It was very slow and unused. --- src/gui/widgets/desktop.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gui/widgets/desktop.cpp') diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 6352c300f..a0f2eb3fe 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -32,6 +32,7 @@ #include "gui/widgets/label.h" #include "resources/image.h" +#include "resources/imagehelper.h" #include "resources/resourcemanager.h" #include "resources/wallpaper.h" @@ -99,7 +100,7 @@ void Desktop::draw(gcn::Graphics *graphics) if (mWallpaper) { - if (!mWallpaper->useOpenGL()) + if (!ImageHelper::useOpenGL()) { g->drawImage(mWallpaper, (getWidth() - mWallpaper->getWidth()) / 2, @@ -135,7 +136,7 @@ void Desktop::setBestFittingWallpaper() if (mWallpaper) mWallpaper->decRef(); - if (!nWallPaper->useOpenGL() + if (!ImageHelper::useOpenGL() && (nWallPaper->getWidth() != getWidth() || nWallPaper->getHeight() != getHeight())) { -- cgit v1.2.3-60-g2f50