From 678009add727cc34f9c157f2cf41c4c0ac8f7f30 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 30 Jan 2009 14:58:27 -0700 Subject: Reflowed status window using the layout class. Signed-off-by: Ira Rice --- src/gui/status.cpp | 216 +++++++++++++++-------------------------------------- 1 file changed, 60 insertions(+), 156 deletions(-) (limited to 'src/gui/status.cpp') diff --git a/src/gui/status.cpp b/src/gui/status.cpp index bd6048f3..86d3f0d0 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -26,6 +26,8 @@ #include "status.h" #include "windowcontainer.h" +#include "widgets/layout.h" + #include "../localplayer.h" #include "../utils/gettext.h" @@ -39,8 +41,7 @@ StatusWindow::StatusWindow(LocalPlayer *player): setWindowName(_("Status")); setCloseButton(true); setDefaultSize((windowContainer->getWidth() - 365) / 2, - (windowContainer->getHeight() - 255) / 2, 400, 275); - loadWindowState(); + (windowContainer->getHeight() - 255) / 2, 400, 335); // ---------------------- // Status Part @@ -52,70 +53,15 @@ StatusWindow::StatusWindow(LocalPlayer *player): mHpLabel = new gcn::Label(_("HP:")); mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34); - mHpValueLabel = new gcn::Label; mXpLabel = new gcn::Label(_("Exp:")); mXpBar = new ProgressBar(1.0f, 80, 15, 143, 192, 211); - mXpValueLabel = new gcn::Label; mMpLabel = new gcn::Label(_("MP:")); mMpBar = new ProgressBar(1.0f, 80, 15, 26, 102, 230); - mMpValueLabel = new gcn::Label; - - mJobXpLabel = new gcn::Label(_("Job:")); - mJobXpBar = new ProgressBar(1.0f, 80, 15, 220, 135, 203); - mJobValueLabel = new gcn::Label; - - int y = 3; - int x = 5; - - mLvlLabel->setPosition(x, y); - x += mLvlLabel->getWidth() + 40; - mJobLvlLabel->setPosition(x, y); - x += mJobLvlLabel->getWidth() + 40; - mGpLabel->setPosition(x, y); - - y += mLvlLabel->getHeight() + 5; // Next Row - x = 5; - - mHpLabel->setPosition(x, y); - x += mHpLabel->getWidth() + 5; - mHpBar->setPosition(x, y); - x += mHpBar->getWidth() + 5; - mHpValueLabel->setPosition(x, y); - - mXpLabel->setPosition(175, y); - mXpBar->setPosition(205, y); - mXpValueLabel->setPosition(290, y); - - y += mHpLabel->getHeight() + 5; // Next Row - x = 5; - - mMpLabel->setPosition(x, y); - x += mMpLabel->getWidth() + 5; - mMpBar->setPosition(x, y); - x += mMpBar->getWidth() + 5; - mMpValueLabel->setPosition(x, y); - - mJobXpLabel->setPosition(175, y); - mJobXpBar->setPosition(205, y); - mJobValueLabel->setPosition(290, y); - - add(mLvlLabel); - add(mJobLvlLabel); - add(mGpLabel); - add(mHpLabel); - add(mHpValueLabel); - add(mMpLabel); - add(mMpValueLabel); - add(mXpLabel); - add(mXpValueLabel); - add(mJobXpLabel); - add(mJobValueLabel); - add(mHpBar); - add(mMpBar); - add(mXpBar); - add(mJobXpBar); + + mJobLabel = new gcn::Label(_("Job:")); + mJobBar = new ProgressBar(1.0f, 80, 15, 220, 135, 203); // ---------------------- // Stats Part @@ -144,7 +90,8 @@ StatusWindow::StatusWindow(LocalPlayer *player): mStatsReflexPoints = new gcn::Label; // New labels - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) + { mStatsLabel[i] = new gcn::Label; mStatsDisplayLabel[i] = new gcn::Label; mPointsLabel[i] = new gcn::Label("0"); @@ -159,68 +106,53 @@ StatusWindow::StatusWindow(LocalPlayer *player): mStatsButton[4] = new Button("+", "DEX", this); mStatsButton[5] = new Button("+", "LUK", this); - - // Set position - mStatsTitleLabel->setPosition(mMpLabel->getX(), mMpLabel->getY() + 23 ); - mStatsTotalLabel->setPosition(110, mStatsTitleLabel->getY() + 15); - int totalLabelY = mStatsTotalLabel->getY(); - mStatsCostLabel->setPosition(170, totalLabelY); - - for (int i = 0; i < 6; i++) - { - mStatsLabel[i]->setPosition(5, mStatsTotalLabel->getY() + (i * 23) + 15); - mStatsDisplayLabel[i]->setPosition(115, - totalLabelY + (i * 23) + 15); - mStatsButton[i]->setPosition(145, totalLabelY + (i * 23) + 10); - mPointsLabel[i]->setPosition(175, totalLabelY + (i * 23) + 15); - } - - mRemainingStatsPointsLabel->setPosition(5, mPointsLabel[5]->getY() + 25); - - mStatsAttackLabel->setPosition(220, mStatsLabel[0]->getY()); - mStatsDefenseLabel->setPosition(220, mStatsLabel[1]->getY()); - mStatsMagicAttackLabel->setPosition(220, mStatsLabel[2]->getY()); - mStatsMagicDefenseLabel->setPosition(220, mStatsLabel[3]->getY()); - mStatsAccuracyLabel->setPosition(220, mStatsLabel[4]->getY()); - mStatsEvadeLabel->setPosition(220, mStatsLabel[5]->getY()); - mStatsReflexLabel->setPosition(220, mRemainingStatsPointsLabel->getY()); - - mStatsAttackPoints->setPosition(310, mStatsLabel[0]->getY()); - mStatsDefensePoints->setPosition(310, mStatsLabel[1]->getY()); - mStatsMagicAttackPoints->setPosition(310, mStatsLabel[2]->getY()); - mStatsMagicDefensePoints->setPosition(310, mStatsLabel[3]->getY()); - mStatsAccuracyPoints->setPosition(310, mStatsLabel[4]->getY()); - mStatsEvadePoints->setPosition(310, mStatsLabel[5]->getY()); - mStatsReflexPoints->setPosition(310, mRemainingStatsPointsLabel->getY()); - // Assemble - add(mStatsTitleLabel); - add(mStatsTotalLabel); - add(mStatsCostLabel); + ContainerPlacer place; + place = getPlacer(0, 0); + + place(0, 0, mLvlLabel, 3); + place(5, 0, mJobLvlLabel, 3); + place(8, 0, mGpLabel, 3); + place(1, 1, mHpLabel); + place(2, 1, mHpBar, 3); + place(6, 1, mXpLabel); + place(7, 1, mXpBar, 3); + place(1, 2, mMpLabel); + place(2, 2, mMpBar, 3); + place(6, 2, mJobLabel); + place(7, 2, mJobBar, 3); + place.getCell().matchColWidth(0, 1); + place = getPlacer(0, 3); + place(0, 0, mStatsTitleLabel, 3); + place(4, 1, mStatsTotalLabel, 2); + place(7, 1, mStatsCostLabel, 2); for(int i = 0; i < 6; i++) { - add(mStatsLabel[i]); - add(mStatsDisplayLabel[i]); - add(mStatsButton[i]); - add(mPointsLabel[i]); + place(0, 2 + i, mStatsLabel[i], 3).setPadding(5); + place(4, 2 + i, mStatsDisplayLabel[i]).setPadding(5); + place(6, 2 + i, mStatsButton[i]); + place(7, 2 + i, mPointsLabel[i]).setPadding(5); } - add(mStatsAttackLabel); - add(mStatsDefenseLabel); - add(mStatsMagicAttackLabel); - add(mStatsMagicDefenseLabel); - add(mStatsAccuracyLabel); - add(mStatsEvadeLabel); - add(mStatsReflexLabel); - - add(mStatsAttackPoints); - add(mStatsDefensePoints); - add(mStatsMagicAttackPoints); - add(mStatsMagicDefensePoints); - add(mStatsAccuracyPoints); - add(mStatsEvadePoints); - add(mStatsReflexPoints); - - add(mRemainingStatsPointsLabel); + place(10, 2, mStatsAttackLabel, 3).setPadding(5); + place(10, 3, mStatsDefenseLabel, 3).setPadding(5); + place(10, 4, mStatsMagicAttackLabel, 3).setPadding(5); + place(10, 5, mStatsMagicDefenseLabel, 3).setPadding(5); + place(10, 6, mStatsAccuracyLabel, 3).setPadding(5); + place(10, 7, mStatsEvadeLabel, 3).setPadding(5); + place(10, 8, mStatsReflexLabel, 3).setPadding(5); + place(13, 2, mStatsAttackPoints, 3).setPadding(5); + place(13, 3, mStatsDefensePoints, 3).setPadding(5); + place(13, 4, mStatsMagicAttackPoints, 3).setPadding(5); + place(13, 5, mStatsMagicDefensePoints, 3).setPadding(5); + place(13, 6, mStatsAccuracyPoints, 3).setPadding(5); + place(13, 7, mStatsEvadePoints, 3).setPadding(5); + place(13, 8, mStatsReflexPoints, 3).setPadding(5); + place(0, 8, mRemainingStatsPointsLabel, 3).setPadding(5); + + Layout &layout = getLayout(); + layout.setRowHeight(0, Layout::AUTO_SET); + + loadWindowState(); } void StatusWindow::update() @@ -236,21 +168,17 @@ void StatusWindow::update() mGpLabel->setCaption(strprintf(_("Money: %d GP"), mPlayer->mGp)); mGpLabel->adjustSize(); - mHpValueLabel->setCaption(toString(mPlayer->mHp) + - "/" + toString(mPlayer->mMaxHp)); - mHpValueLabel->adjustSize(); + mHpBar->setText(toString(mPlayer->mHp) + + "/" + toString(mPlayer->mMaxHp)); - mMpValueLabel->setCaption(toString(mPlayer->mMp) + - "/" + toString(mPlayer->mMaxMp)); - mMpValueLabel->adjustSize(); + mMpBar->setText(toString(mPlayer->mMp) + + "/" + toString(mPlayer->mMaxMp)); - mXpValueLabel->setCaption(toString(mPlayer->getXp()) + - "/" + toString(mPlayer->mXpForNextLevel)); - mXpValueLabel->adjustSize(); + mXpBar->setText(toString(mPlayer->getXp()) + + "/" + toString(mPlayer->mXpForNextLevel)); - mJobValueLabel->setCaption(toString(mPlayer->mJobXp) + - "/" + toString(mPlayer->mJobXpForNextLevel)); - mJobValueLabel->adjustSize(); + mJobBar->setText(toString(mPlayer->mJobXp) + + "/" + toString(mPlayer->mJobXpForNextLevel)); // HP Bar coloration if (mPlayer->mHp < int(mPlayer->mMaxHp / 3)) @@ -271,7 +199,7 @@ void StatusWindow::update() mXpBar->setProgress( (float) mPlayer->getXp() / (float) mPlayer->mXpForNextLevel); - mJobXpBar->setProgress( + mJobBar->setProgress( (float) mPlayer->mJobXp / (float) mPlayer->mJobXpForNextLevel); // Stats Part @@ -336,30 +264,6 @@ void StatusWindow::update() // Reflex % mStatsReflexPoints->setCaption(toString(mPlayer->DEX / 4)); // + counter mStatsReflexPoints->adjustSize(); - - // Update Second column widgets position - mJobLvlLabel->setPosition(mLvlLabel->getX() + mLvlLabel->getWidth() + 20, - mLvlLabel->getY()); - mGpLabel->setPosition(mJobLvlLabel->getX() + mJobLvlLabel->getWidth() + 20, - mJobLvlLabel->getY()); - - mXpLabel->setPosition( - mHpValueLabel->getX() + mHpValueLabel->getWidth() + 10, - mHpLabel->getY()); - mXpBar->setPosition( - mXpLabel->getX() + mXpLabel->getWidth() + 5, - mXpLabel->getY()); - mXpValueLabel->setPosition( - mXpBar->getX() + mXpBar->getWidth() + 5, - mXpLabel->getY()); - - mJobXpLabel->setPosition(mXpBar->getX() - mJobXpLabel->getWidth() - 5, - mMpLabel->getY()); - mJobXpBar->setPosition( - mJobXpLabel->getX() + mJobXpLabel->getWidth() + 5, - mJobXpLabel->getY()); - mJobValueLabel->setPosition(mJobXpBar->getX() + mJobXpBar->getWidth() + 5, - mJobXpLabel->getY()); } void StatusWindow::draw(gcn::Graphics *g) -- cgit v1.2.3-70-g09d2 From ff6cd3ac0855cf516e364382153a77f61521ccdb Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 30 Jan 2009 16:08:19 -0700 Subject: Swapped the default settings for two labels, which had been mixed up. Signed-off-by: Ira Rice --- src/gui/status.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/status.cpp') diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 86d3f0d0..8b760427 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -48,8 +48,8 @@ StatusWindow::StatusWindow(LocalPlayer *player): // ---------------------- mLvlLabel = new gcn::Label(strprintf(_("Level: %d"), 0)); - mGpLabel = new gcn::Label(strprintf(_("Job: %d"), 0)); - mJobLvlLabel = new gcn::Label(strprintf(_("Money: %d GP"), 0)); + mJobLvlLabel = new gcn::Label(strprintf(_("Job: %d"), 0)); + mGpLabel = new gcn::Label(strprintf(_("Money: %d GP"), 0)); mHpLabel = new gcn::Label(_("HP:")); mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34); -- cgit v1.2.3-70-g09d2 From fda9224156f68587c328ef80c74b6a765b3cb725 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sat, 7 Feb 2009 13:30:02 -0700 Subject: Adjusted the status window to try to make it a little more translation friendly (Omphalia was reporting that the Total label was getting cut off in the German translation) Signed-off-by: Ira Rice --- src/gui/status.cpp | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'src/gui/status.cpp') diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 8b760427..67a1e5d9 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -71,6 +71,8 @@ StatusWindow::StatusWindow(LocalPlayer *player): gcn::Label *mStatsTitleLabel = new gcn::Label(_("Stats")); gcn::Label *mStatsTotalLabel = new gcn::Label(_("Total")); gcn::Label *mStatsCostLabel = new gcn::Label(_("Cost")); + mStatsTotalLabel->setAlignment(gcn::Graphics::CENTER); + mStatsCostLabel->setAlignment(gcn::Graphics::CENTER); // Derived Stats mStatsAttackLabel = new gcn::Label(_("Attack:")); @@ -92,9 +94,11 @@ StatusWindow::StatusWindow(LocalPlayer *player): // New labels for (int i = 0; i < 6; i++) { - mStatsLabel[i] = new gcn::Label; + mStatsLabel[i] = new gcn::Label("0"); + mStatsLabel[i]->setAlignment(gcn::Graphics::CENTER); mStatsDisplayLabel[i] = new gcn::Label; mPointsLabel[i] = new gcn::Label("0"); + mPointsLabel[i]->setAlignment(gcn::Graphics::CENTER); } mRemainingStatsPointsLabel = new gcn::Label; @@ -123,30 +127,30 @@ StatusWindow::StatusWindow(LocalPlayer *player): place(7, 2, mJobBar, 3); place.getCell().matchColWidth(0, 1); place = getPlacer(0, 3); - place(0, 0, mStatsTitleLabel, 3); - place(4, 1, mStatsTotalLabel, 2); - place(7, 1, mStatsCostLabel, 2); + place(0, 0, mStatsTitleLabel, 5); + place(4, 1, mStatsTotalLabel, 5); + place(10, 1, mStatsCostLabel, 5); for(int i = 0; i < 6; i++) { place(0, 2 + i, mStatsLabel[i], 3).setPadding(5); - place(4, 2 + i, mStatsDisplayLabel[i]).setPadding(5); - place(6, 2 + i, mStatsButton[i]); - place(7, 2 + i, mPointsLabel[i]).setPadding(5); + place(6, 2 + i, mStatsDisplayLabel[i]).setPadding(5); + place(9, 2 + i, mStatsButton[i]); + place(12, 2 + i, mPointsLabel[i]).setPadding(5); } - place(10, 2, mStatsAttackLabel, 3).setPadding(5); - place(10, 3, mStatsDefenseLabel, 3).setPadding(5); - place(10, 4, mStatsMagicAttackLabel, 3).setPadding(5); - place(10, 5, mStatsMagicDefenseLabel, 3).setPadding(5); - place(10, 6, mStatsAccuracyLabel, 3).setPadding(5); - place(10, 7, mStatsEvadeLabel, 3).setPadding(5); - place(10, 8, mStatsReflexLabel, 3).setPadding(5); - place(13, 2, mStatsAttackPoints, 3).setPadding(5); - place(13, 3, mStatsDefensePoints, 3).setPadding(5); - place(13, 4, mStatsMagicAttackPoints, 3).setPadding(5); - place(13, 5, mStatsMagicDefensePoints, 3).setPadding(5); - place(13, 6, mStatsAccuracyPoints, 3).setPadding(5); - place(13, 7, mStatsEvadePoints, 3).setPadding(5); - place(13, 8, mStatsReflexPoints, 3).setPadding(5); + place(15, 2, mStatsAttackLabel, 5).setPadding(5); + place(15, 3, mStatsDefenseLabel, 5).setPadding(5); + place(15, 4, mStatsMagicAttackLabel, 5).setPadding(5); + place(15, 5, mStatsMagicDefenseLabel, 5).setPadding(5); + place(15, 6, mStatsAccuracyLabel, 5).setPadding(5); + place(15, 7, mStatsEvadeLabel, 5).setPadding(5); + place(15, 8, mStatsReflexLabel, 5).setPadding(5); + place(20, 2, mStatsAttackPoints, 3).setPadding(5); + place(20, 3, mStatsDefensePoints, 3).setPadding(5); + place(20, 4, mStatsMagicAttackPoints, 3).setPadding(5); + place(20, 5, mStatsMagicDefensePoints, 3).setPadding(5); + place(20, 6, mStatsAccuracyPoints, 3).setPadding(5); + place(20, 7, mStatsEvadePoints, 3).setPadding(5); + place(20, 8, mStatsReflexPoints, 3).setPadding(5); place(0, 8, mRemainingStatsPointsLabel, 3).setPadding(5); Layout &layout = getLayout(); -- cgit v1.2.3-70-g09d2 From df49049a3951421c39340a8ca4b8dba18056daf0 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sat, 7 Feb 2009 13:56:23 -0700 Subject: More modifications based on critiques by Omphalia. Signed-off-by: Ira Rice --- src/gui/status.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/gui/status.cpp') diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 67a1e5d9..f808eadf 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -72,7 +72,6 @@ StatusWindow::StatusWindow(LocalPlayer *player): gcn::Label *mStatsTotalLabel = new gcn::Label(_("Total")); gcn::Label *mStatsCostLabel = new gcn::Label(_("Cost")); mStatsTotalLabel->setAlignment(gcn::Graphics::CENTER); - mStatsCostLabel->setAlignment(gcn::Graphics::CENTER); // Derived Stats mStatsAttackLabel = new gcn::Label(_("Attack:")); @@ -129,21 +128,21 @@ StatusWindow::StatusWindow(LocalPlayer *player): place = getPlacer(0, 3); place(0, 0, mStatsTitleLabel, 5); place(4, 1, mStatsTotalLabel, 5); - place(10, 1, mStatsCostLabel, 5); + place(11, 1, mStatsCostLabel, 5); for(int i = 0; i < 6; i++) { place(0, 2 + i, mStatsLabel[i], 3).setPadding(5); place(6, 2 + i, mStatsDisplayLabel[i]).setPadding(5); place(9, 2 + i, mStatsButton[i]); - place(12, 2 + i, mPointsLabel[i]).setPadding(5); + place(11, 2 + i, mPointsLabel[i]).setPadding(5); } - place(15, 2, mStatsAttackLabel, 5).setPadding(5); - place(15, 3, mStatsDefenseLabel, 5).setPadding(5); - place(15, 4, mStatsMagicAttackLabel, 5).setPadding(5); - place(15, 5, mStatsMagicDefenseLabel, 5).setPadding(5); - place(15, 6, mStatsAccuracyLabel, 5).setPadding(5); - place(15, 7, mStatsEvadeLabel, 5).setPadding(5); - place(15, 8, mStatsReflexLabel, 5).setPadding(5); + place(13, 2, mStatsAttackLabel, 7).setPadding(5); + place(13, 3, mStatsDefenseLabel, 7).setPadding(5); + place(13, 4, mStatsMagicAttackLabel, 7).setPadding(5); + place(13, 5, mStatsMagicDefenseLabel, 7).setPadding(5); + place(13, 6, mStatsAccuracyLabel, 7).setPadding(5); + place(13, 7, mStatsEvadeLabel, 7).setPadding(5); + place(13, 8, mStatsReflexLabel, 7).setPadding(5); place(20, 2, mStatsAttackPoints, 3).setPadding(5); place(20, 3, mStatsDefensePoints, 3).setPadding(5); place(20, 4, mStatsMagicAttackPoints, 3).setPadding(5); -- cgit v1.2.3-70-g09d2 From e973dd25b1181ddb554a56888c3c361f131b4b3a Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sat, 7 Feb 2009 14:02:37 -0700 Subject: Added a bit more spacing for stat labels as well, which I didn't think about in the last commit. They may work for each of the languages already tested, but this will make sure that it's wide enough for the ones which haven't been tested. Signed-off-by: Ira Rice --- src/gui/status.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/gui/status.cpp') diff --git a/src/gui/status.cpp b/src/gui/status.cpp index f808eadf..e0e43b36 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -127,29 +127,29 @@ StatusWindow::StatusWindow(LocalPlayer *player): place.getCell().matchColWidth(0, 1); place = getPlacer(0, 3); place(0, 0, mStatsTitleLabel, 5); - place(4, 1, mStatsTotalLabel, 5); - place(11, 1, mStatsCostLabel, 5); + place(5, 1, mStatsTotalLabel, 5); + place(12, 1, mStatsCostLabel, 5); for(int i = 0; i < 6; i++) { - place(0, 2 + i, mStatsLabel[i], 3).setPadding(5); - place(6, 2 + i, mStatsDisplayLabel[i]).setPadding(5); - place(9, 2 + i, mStatsButton[i]); - place(11, 2 + i, mPointsLabel[i]).setPadding(5); + place(0, 2 + i, mStatsLabel[i], 7).setPadding(5); + place(7, 2 + i, mStatsDisplayLabel[i]).setPadding(5); + place(10, 2 + i, mStatsButton[i]); + place(12, 2 + i, mPointsLabel[i]).setPadding(5); } - place(13, 2, mStatsAttackLabel, 7).setPadding(5); - place(13, 3, mStatsDefenseLabel, 7).setPadding(5); - place(13, 4, mStatsMagicAttackLabel, 7).setPadding(5); - place(13, 5, mStatsMagicDefenseLabel, 7).setPadding(5); - place(13, 6, mStatsAccuracyLabel, 7).setPadding(5); - place(13, 7, mStatsEvadeLabel, 7).setPadding(5); - place(13, 8, mStatsReflexLabel, 7).setPadding(5); - place(20, 2, mStatsAttackPoints, 3).setPadding(5); - place(20, 3, mStatsDefensePoints, 3).setPadding(5); - place(20, 4, mStatsMagicAttackPoints, 3).setPadding(5); - place(20, 5, mStatsMagicDefensePoints, 3).setPadding(5); - place(20, 6, mStatsAccuracyPoints, 3).setPadding(5); - place(20, 7, mStatsEvadePoints, 3).setPadding(5); - place(20, 8, mStatsReflexPoints, 3).setPadding(5); + place(14, 2, mStatsAttackLabel, 7).setPadding(5); + place(14, 3, mStatsDefenseLabel, 7).setPadding(5); + place(14, 4, mStatsMagicAttackLabel, 7).setPadding(5); + place(14, 5, mStatsMagicDefenseLabel, 7).setPadding(5); + place(14, 6, mStatsAccuracyLabel, 7).setPadding(5); + place(14, 7, mStatsEvadeLabel, 7).setPadding(5); + place(14, 8, mStatsReflexLabel, 7).setPadding(5); + place(21, 2, mStatsAttackPoints, 3).setPadding(5); + place(21, 3, mStatsDefensePoints, 3).setPadding(5); + place(21, 4, mStatsMagicAttackPoints, 3).setPadding(5); + place(21, 5, mStatsMagicDefensePoints, 3).setPadding(5); + place(21, 6, mStatsAccuracyPoints, 3).setPadding(5); + place(21, 7, mStatsEvadePoints, 3).setPadding(5); + place(21, 8, mStatsReflexPoints, 3).setPadding(5); place(0, 8, mRemainingStatsPointsLabel, 3).setPadding(5); Layout &layout = getLayout(); -- cgit v1.2.3-70-g09d2