diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-06-09 22:46:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-06-09 23:50:09 +0300 |
| commit | ff11053f5f638749c3564c464dc41ebc474b4897 (patch) | |
| tree | 8cf7ed8485528c7498612199c7ca56a6fd84f5e5 /src/gui/widgets | |
| parent | b2c1c301b1e39fbbbb5bde3d4d55d14a9873b51f (diff) | |
| download | manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.gz manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.bz2 manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.xz manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.zip | |
Move static methods from Image class to ImageHelper class.
Remove SDL merge method. It was very slow and unused.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/desktop.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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())) { |