From 1f5f9385fe7383dd5b71baac10b209349f3823ce Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Wed, 13 May 2009 15:06:26 -0600 Subject: Fix how the PartyWindow lays out Avatars Also fix the height of Avatars --- src/gui/partywindow.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src/gui/partywindow.cpp') diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp index 996073bd..1260a2c3 100644 --- a/src/gui/partywindow.cpp +++ b/src/gui/partywindow.cpp @@ -92,9 +92,10 @@ PartyMember *PartyWindow::findOrCreateMember(int id) { member = new PartyMember; mMembers[id] = member; - add(member->avatar, 0, (mMembers.size() - 1) * 14); } + buildLayout(); + return member; } @@ -148,6 +149,8 @@ void PartyWindow::removeMember(int id) void PartyWindow::removeMember(const std::string &name) { removeMember(findMember(name)); + + buildLayout(); } void PartyWindow::updateOnlne(int id, bool online) @@ -225,3 +228,19 @@ void PartyWindow::clearMembers() delete_all(mMembers); mMembers.clear(); } + +void PartyWindow::buildLayout() +{ + clearLayout(); + int lastPos = 0; + + PartyList::iterator it; + PartyMember *member; + + for (it = mMembers.begin(); it != mMembers.end(); it++) + { + member = (*it).second; + add(member->avatar, 0, lastPos); + lastPos += member->avatar->getHeight() + 2; + } +} -- cgit v1.2.3-70-g09d2 From ff4b7434b7bd25412a24a13bc0ef00e253c17f0e Mon Sep 17 00:00:00 2001 From: Maximilian Philipps Date: Fri, 15 May 2009 17:43:58 +0200 Subject: scale the partywindow down --- src/gui/partywindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/partywindow.cpp') diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp index 1260a2c3..68e5a371 100644 --- a/src/gui/partywindow.cpp +++ b/src/gui/partywindow.cpp @@ -54,8 +54,8 @@ PartyWindow::PartyWindow() : setSaveVisible(true); setCloseButton(true); setMinWidth(120); - setMinHeight(200); - setDefaultSize(590, 200, 150, 200); + setMinHeight(55); + setDefaultSize(590, 200, 150, 60); loadWindowState(); } -- cgit v1.2.3-70-g09d2