From df91c40fa79629adb2652ed1b5141d943113a936 Mon Sep 17 00:00:00 2001 From: Stefan Dombrowski Date: Fri, 20 Aug 2010 18:09:37 +0200 Subject: Show info popups for all players Until now popups were only shown for players who are member of a party. This resolves http://bugs.manasource.org/view.php?id=197 Signed-off-by: Jared Adams --- src/gui/beingpopup.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/gui/beingpopup.cpp') diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index 687b20c2..2150f7e5 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -65,25 +65,28 @@ void BeingPopup::show(int x, int y, Player *p) return; } + mBeingName->setCaption(p->getName()); + mBeingName->adjustSize(); + + int minWidth = mBeingName->getWidth(); + const int height = getFont()->getHeight(); + if (!(p->getPartyName().empty())) { - mBeingName->setCaption(p->getName()); - mBeingName->adjustSize(); - mBeingParty->setCaption(strprintf(_("Party: %s"), p->getPartyName().c_str())); mBeingParty->adjustSize(); - int minWidth = std::max(mBeingName->getWidth(), - mBeingParty->getWidth()); - - const int height = getFont()->getHeight(); + if (minWidth < mBeingParty->getWidth()) + minWidth = mBeingParty->getWidth(); setContentSize(minWidth + 10, (height * 2) + 10); - - position(x, y); - return; + } + else + { + mBeingParty->setCaption(""); + setContentSize(minWidth + 10, height + 10); } - setVisible(false); + position(x, y); } -- cgit v1.2.3-70-g09d2