diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/gui/ministatus.cpp | 4 | ||||
| -rw-r--r-- | src/gui/status.cpp | 13 |
3 files changed, 19 insertions, 1 deletions
@@ -5,6 +5,9 @@ shortcuts or with menu button, also corrected the default position of equipment and inventory windows. * src/gui/chat.cpp: Fixed the Chat Window scrolling bug. + * src/gui/status.cpp, src/gui/ministatus.cpp: Changed the font used + in mini-status. Dynamised previously statically placed widgets in + status win to avoid some label over-drawings. 2005-10-02 Bjørn Lindeijer <bjorn@lindeijer.nl> diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 01d7330c..adfda434 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -26,6 +26,7 @@ #include <guichan/widgets/label.hpp> #include <sstream> +#include "gui.h" #include "progressbar.h" #include "../playerinfo.h" @@ -48,6 +49,8 @@ MiniStatusWindow::MiniStatusWindow(): hpLabel = new gcn::Label(""); mpLabel = new gcn::Label(""); + hpLabel->setFont((gcn::Font*)speechFont); + mpLabel->setFont((gcn::Font*)speechFont); add(hpBar); add(mpBar); @@ -106,6 +109,5 @@ void MiniStatusWindow::update() void MiniStatusWindow::draw(gcn::Graphics *graphics) { update(); - Window::drawContent(graphics); } diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 1b570d2a..1a858297 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -413,6 +413,19 @@ void StatusWindow::update() statsReflexPoints->setCaption(updateText.str()); statsReflexPoints->adjustSize(); + // Update Second column widgets position + gpLabel->setPosition(lvlLabel->getX() + lvlLabel->getWidth() + 20, lvlLabel->getY()); + + xpLabel->setPosition(hpValueLabel->getX() + hpValueLabel->getWidth() + 10, + hpLabel->getY()); + xpBar->setPosition(xpLabel->getX() + xpLabel->getWidth() + 5, + xpLabel->getY()); + xpValueLabel->setPosition(xpBar->getX() + xpBar->getWidth() + 5, + xpLabel->getY()); + + jobXpLabel->setPosition(xpLabel->getX(), mpLabel->getY()); + jobXpBar->setPosition(xpBar->getX(),jobXpLabel->getY()); + jobValueLabel->setPosition(290, jobXpLabel->getY()); } void StatusWindow::draw(gcn::Graphics *graphics) |