Merge remote-tracking branch 'upstream/master' into osx

1 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 64da94389..b1c6eba24 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -152,7 +152,7 @@ ProgressBar *MiniStatusWindow::createBar(const float progress,
 
 void MiniStatusWindow::updateBars()
 {
-    int x = mPadding;
+    int x = 0;
     const ProgressBar *lastBar = nullptr;
     for (std::vector <ProgressBar*>::const_iterator it = mBars.begin(),
          it_end = mBars.end(); it != it_end; ++it)
@@ -167,7 +167,7 @@ void MiniStatusWindow::updateBars()
             continue;
         if (bar->isVisible())
         {
-            bar->setPosition(x, mPadding);
+            bar->setPosition(x, 0);
             add(bar);
             x += bar->getWidth() + mSpacing;
             lastBar = bar;
@@ -176,9 +176,8 @@ void MiniStatusWindow::updateBars()
 
     if (lastBar)
     {
-        const int pad2 = 2 * mPadding;
-        setContentSize(lastBar->getX() + lastBar->getWidth() + pad2,
-            lastBar->getY() + lastBar->getHeight() + pad2);
+        setContentSize(lastBar->getX() + lastBar->getWidth(),
+            lastBar->getY() + lastBar->getHeight());
     }
 }
 
@@ -490,6 +489,7 @@ void MiniStatusWindow::updateArrows()
 
 gcn::Rectangle MiniStatusWindow::getChildrenArea()
 {
-    return gcn::Rectangle(getPadding(), 0, getWidth() - getPadding() * 2,
-                          getHeight() - getPadding() * 2);
+    return gcn::Rectangle(getPadding(), getPadding(),
+        getWidth() - getPadding() * 2,
+        getHeight() - getPadding() * 2);
 }