diff options
| author | David Athay <ko2fan@gmail.com> | 2009-05-14 12:16:34 +0100 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-05-14 12:16:34 +0100 |
| commit | dc1eb0895382451b1c79c60ecb7ca7dbbec89681 (patch) | |
| tree | 56742cbe8674d68e152f23885a7e062becf9b5ce /src/gui/widgets/avatar.cpp | |
| parent | c96fbe557a3274325399411456e98a5a63b1bc54 (diff) | |
| parent | 39e06227df101a73aa5b9078a3afb6a7a71b89ba (diff) | |
| download | mana-client-dc1eb0895382451b1c79c60ecb7ca7dbbec89681.tar.gz mana-client-dc1eb0895382451b1c79c60ecb7ca7dbbec89681.tar.bz2 mana-client-dc1eb0895382451b1c79c60ecb7ca7dbbec89681.tar.xz mana-client-dc1eb0895382451b1c79c60ecb7ca7dbbec89681.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/widgets/avatar.cpp')
| -rw-r--r-- | src/gui/widgets/avatar.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp index b120c51f..16c77233 100644 --- a/src/gui/widgets/avatar.cpp +++ b/src/gui/widgets/avatar.cpp @@ -42,7 +42,6 @@ Avatar::Avatar(): mMaxHp(0) { setOpaque(false); - setSize(200, 12); if (avatarCount == 0) { @@ -54,12 +53,17 @@ Avatar::Avatar(): avatarStatusOffline->incRef(); avatarStatusOnline->incRef(); + mLabel = new Label; + mLabel->adjustSize(); + mStatus = new Icon(avatarStatusOffline); mStatus->setSize(12, 12); - add(mStatus, 1, 0); - mLabel = new Label; - mLabel->setSize(174, 12); + + add(mStatus, 1, (mLabel->getHeight() - 12) / 2); add(mLabel, 16, 0); + + setSize(250, mLabel->getHeight()); + } Avatar::~Avatar() @@ -108,4 +112,5 @@ void Avatar::updateAvatarLabel() ss << " (" << mHp << "/" << mMaxHp << ")"; mLabel->setCaption(ss.str()); + mLabel->adjustSize(); } |