diff options
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/desktop.cpp | 24 | ||||
-rw-r--r-- | src/gui/widgets/desktop.h | 6 |
2 files changed, 10 insertions, 20 deletions
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 4583ef13..13ac866a 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -32,9 +32,6 @@ #include "log.h" #include "main.h" -#define VERSION_LABEL_X 25 -#define VERSION_LABEL_Y 2 - Desktop::Desktop() : mWallpaper(0) { @@ -42,17 +39,9 @@ Desktop::Desktop() Wallpaper::loadWallpapers(); - gcn::Label *versionLabel = new Label(FULL_VERSION); - add(versionLabel, VERSION_LABEL_X, VERSION_LABEL_Y); - - mVersionRectangle.x = VERSION_LABEL_X; - mVersionRectangle.y = VERSION_LABEL_Y; - mVersionRectangle.width = versionLabel->getWidth(); - mVersionRectangle.height = versionLabel->getHeight(); - - // Loads a white pattern and make it translucent... - mVersionBorder = Image::getColoredPattern(0xFF, 0xFF, 0xFF); - mVersionBorder->setAlpha(0.5f); + mVersionLabel = new Label(FULL_VERSION); + mVersionLabel->setBackgroundColor(gcn::Color(255, 255, 255, 128)); + add(mVersionLabel, 25, 2); } Desktop::~Desktop() @@ -97,9 +86,8 @@ void Desktop::draw(gcn::Graphics *graphics) } // Draw a thin border under the application version... - g->drawImagePattern(mVersionBorder, mVersionRectangle.x, mVersionRectangle.y, - mVersionRectangle.width, - mVersionRectangle.height); + g->setColor(gcn::Color(255, 255, 255, 128)); + g->fillRectangle(gcn::Rectangle(mVersionLabel->getDimension())); Container::draw(graphics); } @@ -128,7 +116,7 @@ void Desktop::setBestFittingWallpaper() ResourceManager::getInstance()->addResource(idPath, newRsclWlPpr); mWallpaper = newRsclWlPpr; } - else + else mWallpaper = nWallPaper; } else diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index 267acead..da623bbd 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -24,6 +24,8 @@ #include "gui/widgets/container.h" +#include "guichanfwd.h" + #include <guichan/widgetlistener.hpp> class Image; @@ -59,8 +61,8 @@ class Desktop : public Container, gcn::WidgetListener private: void setBestFittingWallpaper(); - Image *mWallpaper, *mVersionBorder; - gcn::Rectangle mVersionRectangle; + Image *mWallpaper; + gcn::Label *mVersionLabel; }; #endif // DESKTOP_H |