Reorganized status window and used non-bold font for progress bars to make more space for the numbers on the exp bar

(cherry picked from commit addbb9bd9362550e91540c1caaf7f6683bdae9a8)

2 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 7fc42fdb..eca01725 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -125,17 +125,17 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     place(0, 0, mLvlLabel, 3);
     place(5, 0, mJobLvlLabel, 3);
     place(8, 0, mGpLabel, 3);
-    place(1, 1, mHpLabel).setPadding(3);
-    place(2, 1, mHpBar, 3);
-    place(6, 1, mXpLabel).setPadding(3);
-    place(7, 1, mXpBar, 3);
-    place(1, 2, mMpLabel).setPadding(3);
-    place(2, 2, mMpBar, 3);
-    place(6, 2, mJobLabel).setPadding(3);
-    place(7, 2, mJobBar, 3);
+    place(0, 1, mHpLabel).setPadding(3);
+    place(1, 1, mHpBar, 4);
+    place(5, 1, mXpLabel).setPadding(3);
+    place(6, 1, mXpBar, 5);
+    place(0, 2, mMpLabel).setPadding(3);
+    place(1, 2, mMpBar, 4);
+    place(5, 2, mJobLabel).setPadding(3);
+    place(6, 2, mJobBar, 5);
     place.getCell().matchColWidth(0, 1);
     place = getPlacer(0, 3);
-    place(0, 0, mStatsTitleLabel, 5);
+    place(0, 1, mStatsTitleLabel, 5);
     place(5, 1, mStatsTotalLabel, 5);
     place(12, 1, mStatsCostLabel, 5);
     for (int i = 0; i < 6; i++)
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index c673ffb3..134d071f 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -151,7 +151,7 @@ void ProgressBar::draw(gcn::Graphics *graphics)
         TextRenderer::renderText(graphics, mText, textX, textY,
                                  gcn::Graphics::CENTER,
                                  guiPalette->getColor(Palette::PROGRESS_BAR),
-                                 boldFont, true, false);
+                                 gui->getFont(), true, false);
     }
 }