From 927fcf5d0b6eac067e40ac415b3a5ce10dbc4903 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Mon, 18 Feb 2013 16:36:55 +0200 Subject: CHUI-768 Conversation panel resize issue with message panel collapsed : manually resize of the conversations panel --- indra/newview/llfloaterimcontainer.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 2f2b09b589..c1959729d1 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -535,6 +535,13 @@ void LLFloaterIMContainer::draw() setTitle(conversation_floaterp && conversation_floaterp->needsTitleOverwrite() ? conversation_floaterp->getTitle() : mGeneralTitle); } + // "Manually" resize of mConversationsPane: same as temporarity cancellation of the flag "auto_resize=false" for it + if (!mConversationsPane->isCollapsed() && mMessagesPane->isCollapsed()) + { + LLRect stack_rect = mConversationsStack->getRect(); + mConversationsPane->reshape(stack_rect.getWidth(), stack_rect.getHeight(), true); + } + LLFloater::draw(); } @@ -654,6 +661,8 @@ void LLFloaterIMContainer::collapseMessagesPane(bool collapse) gSavedPerAccountSettings.setBOOL("ConversationsExpandMessagePaneFirst", mConversationsPane->isCollapsed()); } + mConversationsPane->setIgnoreReshape(collapse); + // Show/hide the messages pane. mConversationsStack->collapsePanel(mMessagesPane, collapse); -- cgit v1.2.3