Merge branch 'eathena/master'

Conflicts:
	A lot of files.

1 files changed, 9 insertions, 17 deletions

diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 85f21604..02ddab16 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -22,7 +22,9 @@
 #include <guichan/font.hpp>
 
 #include "gui.h"
+#include "palette.h"
 #include "progressbar.h"
+#include "textrenderer.h"
 
 #include "../configuration.h"
 #include "../graphics.h"
@@ -139,32 +141,22 @@ void ProgressBar::draw(gcn::Graphics *graphics)
     // The bar
     if (mProgress > 0)
     {
-
         graphics->setColor(gcn::Color(mRed, mGreen, mBlue, alpha));
         graphics->fillRectangle(gcn::Rectangle(4, 4,
-                    (int) (mProgress * (getWidth() - 8)),
-                    getHeight() - 8));
+                               (int) (mProgress * (getWidth() - 8)),
+                                getHeight() - 8));
     }
 
     // The label
     if (!mText.empty())
     {
-        gcn::Font *f = boldFont;
         const int textX = getWidth() / 2;
-        const int textY = (getHeight() - f->getHeight()) / 2;
-
-        graphics->setFont(f);
-
-        graphics->setColor(gcn::Color(0, 0, 0, alpha));
-        graphics->drawText(mText, textX + 1, textY, gcn::Graphics::CENTER);
-        graphics->drawText(mText, textX, textY - 1, gcn::Graphics::CENTER);
-        graphics->drawText(mText, textX, textY + 1, gcn::Graphics::CENTER);
-        graphics->drawText(mText, textX - 1, textY, gcn::Graphics::CENTER);
-
-        graphics->setColor(gcn::Color(255, 255, 255, alpha));
-        graphics->drawText(mText, textX, textY, gcn::Graphics::CENTER);
+        const int textY = (getHeight() - boldFont->getHeight()) / 2;
 
-        graphics->setColor(gcn::Color(0, 0, 0));
+        TextRenderer::renderText(graphics, mText, textX, textY,
+                                 gcn::Graphics::CENTER,
+                                 guiPalette->getColor(Palette::PROGRESS_BAR,
+                                 alpha), boldFont, true, false);
     }
 }