summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreeyorp <Freeyorp101@NOSPAM@hotmail.com>2009-05-14 00:38:08 +1200
committerJared Adams <jaxad0127@gmail.com>2009-05-13 07:30:28 -0600
commit639260f2e7cccee8092c6ba51db8f1a6e7152fa4 (patch)
tree1c3bd7157cdd2790b28f73eb6966cf4314753001
parentf19d3f4db065472141b9c6bdf63726138006cb14 (diff)
downloadmana-639260f2e7cccee8092c6ba51db8f1a6e7152fa4.tar.gz
mana-639260f2e7cccee8092c6ba51db8f1a6e7152fa4.tar.bz2
mana-639260f2e7cccee8092c6ba51db8f1a6e7152fa4.tar.xz
mana-639260f2e7cccee8092c6ba51db8f1a6e7152fa4.zip
Modify PartyWindow sizing again
Rather than expanding PartyWindow again, call mLabel->adjustSize(); and let players resize the window if they need to. Also shrink the minimum size of the PartyWindow.
-rw-r--r--src/gui/partywindow.cpp4
-rw-r--r--src/gui/widgets/avatar.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 8958c1ec..fdfe5a54 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -53,9 +53,9 @@ PartyWindow::PartyWindow() :
setResizable(true);
setSaveVisible(true);
setCloseButton(true);
- setMinWidth(212);
+ setMinWidth(120);
setMinHeight(200);
- setDefaultSize(590, 200, 212, 200);
+ setDefaultSize(590, 200, 120, 200);
loadWindowState();
}
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index b120c51f..0bbdc468 100644
--- a/src/gui/widgets/avatar.cpp
+++ b/src/gui/widgets/avatar.cpp
@@ -42,7 +42,7 @@ Avatar::Avatar():
mMaxHp(0)
{
setOpaque(false);
- setSize(200, 12);
+ setSize(250, 12);
if (avatarCount == 0)
{
@@ -58,7 +58,7 @@ Avatar::Avatar():
mStatus->setSize(12, 12);
add(mStatus, 1, 0);
mLabel = new Label;
- mLabel->setSize(174, 12);
+ mLabel->adjustSize();
add(mLabel, 16, 0);
}
@@ -108,4 +108,5 @@ void Avatar::updateAvatarLabel()
ss << " (" << mHp << "/" << mMaxHp << ")";
mLabel->setCaption(ss.str());
+ mLabel->adjustSize();
}