Merge branch 'master' of git@gitorious.org:tmw/mainline

2 files changed, 11 insertions, 7 deletions

diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index 0bbdc468..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(250, 12);
 
     if (avatarCount == 0)
     {
@@ -54,12 +53,17 @@ Avatar::Avatar():
     avatarStatusOffline->incRef();
     avatarStatusOnline->incRef();
 
-    mStatus = new Icon(avatarStatusOffline);
-    mStatus->setSize(12, 12);
-    add(mStatus, 1, 0);
     mLabel = new Label;
     mLabel->adjustSize();
+
+    mStatus = new Icon(avatarStatusOffline);
+    mStatus->setSize(12, 12);
+
+    add(mStatus, 1, (mLabel->getHeight() - 12) / 2);
     add(mLabel, 16, 0);
+
+    setSize(250, mLabel->getHeight());
+
 }
 
 Avatar::~Avatar()
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 491e6396..e838aab6 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -140,15 +140,15 @@ void DropDown::draw(gcn::Graphics* graphics)
     const int alpha = (int) (mAlpha * 255.0f);
     gcn::Color faceColor = getBaseColor();
     faceColor.a = alpha;
-    const gcn::Color* highlightColor = &guiPalette->getColor(Palette::HIGHLIGHT,
-            alpha);
+    const gcn::Color *highlightColor =
+            &guiPalette->getColor(Palette::HIGHLIGHT, alpha);
     gcn::Color shadowColor = faceColor - 0x303030;
     shadowColor.a = alpha;
 
     if (mListBox->getListModel() && mListBox->getSelected() >= 0)
     {
         graphics->setFont(getFont());
-        graphics->setColor(guiPalette->getColor(Palette::TEXT, alpha));
+        graphics->setColor(guiPalette->getColor(Palette::TEXT));
         graphics->drawText(mListBox->getListModel()->getElementAt(mListBox->getSelected()), 1, 0);
     }