summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloatercontainer.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-08 17:26:13 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-08 17:26:13 -0700
commit1aba6c119ef05a4cfd91325c8455dc8c60098746 (patch)
treeddd4a3611a0b22efcee6b38b696994c192d6d6c9 /indra/newview/llimfloatercontainer.cpp
parent3f7ecef1968b9087ba7c885a2dd6213120dfa547 (diff)
CHUI-137 : Implement conversation list, temporary solution: add but doesn't take out items from the list
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
-rw-r--r--indra/newview/llimfloatercontainer.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 134d345148..cd19105860 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -115,19 +115,22 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
LLMultiFloater::addFloater(floaterp, select_added_floater, insertion_point);
// CHUI-137
- llinfos << "Merov debug : addFloater, title = " << floaterp->getTitle() << llendl;
// Create a conversation item
- LLConversationItem item(floaterp->getTitle());
- // Add it to the list
+ LLConversationItem* item = new LLConversationItem(floaterp->getTitle());
mConversationsItems.push_back(item);
// Create a widget from it
- LLFolderViewItem* widget = createConversationItemWidget(&item);
- // Add it to the list of widgets
+ LLFolderViewItem* widget = createConversationItemWidget(item);
mConversationsWidgets.push_back(widget);
// Add it to the UI
widget->setVisible(TRUE);
mConversationsListPanel->addChild(widget);
- // Reposition it...
+ LLRect panel_rect = mConversationsListPanel->getRect();
+ S32 item_height = 16;
+ S32 index = mConversationsWidgets.size() - 1;
+ widget->setRect(LLRect(0,
+ panel_rect.getHeight() - item_height*index,
+ panel_rect.getWidth(),
+ panel_rect.getHeight() - item_height*(index+1)));
// CHUI-137 : end
LLView* floater_contents = floaterp->getChild<LLView>("contents_view");