1 files changed, 30 insertions, 6 deletions

diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index a4164bcc..13ac866a 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -39,8 +39,9 @@ Desktop::Desktop()
 
     Wallpaper::loadWallpapers();
 
-    gcn::Label *versionLabel = new Label(FULL_VERSION);
-    add(versionLabel, 25, 2);
+    mVersionLabel = new Label(FULL_VERSION);
+    mVersionLabel->setBackgroundColor(gcn::Color(255, 255, 255, 128));
+    add(mVersionLabel, 25, 2);
 }
 
 Desktop::~Desktop()
@@ -74,11 +75,20 @@ void Desktop::draw(gcn::Graphics *graphics)
 
     if (mWallpaper)
     {
-        g->drawImage(mWallpaper,
+        if (!mWallpaper->isAnOpenGLOne())
+            g->drawImage(mWallpaper,
                 (getWidth() - mWallpaper->getWidth()) / 2,
                 (getHeight() - mWallpaper->getHeight()) / 2);
+        else
+            g->drawRescaledImage(mWallpaper, 0, 0, 0, 0,
+                mWallpaper->getWidth(), mWallpaper->getHeight(),
+                getWidth(), getHeight(), false);
     }
 
+    // Draw a thin border under the application version...
+    g->setColor(gcn::Color(255, 255, 255, 128));
+    g->fillRectangle(gcn::Rectangle(mVersionLabel->getDimension()));
+
     Container::draw(graphics);
 }
 
@@ -87,13 +97,27 @@ void Desktop::setBestFittingWallpaper()
     const std::string wallpaperName =
             Wallpaper::getWallpaper(getWidth(), getHeight());
 
-    Image *temp = ResourceManager::getInstance()->getImage(wallpaperName);
+    Image *nWallPaper = ResourceManager::getInstance()->getImage(wallpaperName);
 
-    if (temp)
+    if (nWallPaper)
     {
         if (mWallpaper)
             mWallpaper->decRef();
-        mWallpaper = temp;
+
+        if (!nWallPaper->isAnOpenGLOne() && (nWallPaper->getWidth() != getWidth()
+            || nWallPaper->getHeight() != getHeight()))
+        {
+            // We rescale to obtain a fullscreen wallpaper...
+            Image *newRsclWlPpr = nWallPaper->SDLgetScaledImage(getWidth(), getHeight());
+            std::string idPath = nWallPaper->getIdPath();
+
+            // We replace the resource in the resource manager
+            nWallPaper->decRef();
+            ResourceManager::getInstance()->addResource(idPath, newRsclWlPpr);
+            mWallpaper = newRsclWlPpr;
+        }
+            else
+                mWallpaper = nWallPaper;
     }
     else
     {