diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-08 22:20:58 +0300 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-08 22:20:58 +0300 |
| commit | 93e36340ec895a44d0b0bc73157fe23279883863 (patch) | |
| tree | ba7b01096165fabd77ad5dd267864e4a5617867f | |
| parent | 698cfc2811a6ce976a153a1a0d87d31c56dd52ec (diff) | |
CHUI-331 (Resizing conversation list when message panel is collapsed does not resize list)
fixed
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 94e7f1000b..5f111b39d4 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -553,12 +553,25 @@ void LLIMFloaterContainer::collapseMessagesPane(bool collapse) gSavedPerAccountSettings.setBOOL("ConversationsExpandMessagePaneFirst", mConversationsPane->isCollapsed()); } + // Save left pane rectangle before collapsing/expanding right pane. + LLRect prevRect = mConversationsPane->getRect(); + // Show/hide the messages pane. mConversationsStack->collapsePanel(mMessagesPane, collapse); + if (!collapse) + { + // Make sure layout is updated before resizing conversation pane. + mConversationsStack->updateLayout(); + } + updateState(collapse, gSavedPerAccountSettings.getS32("ConversationsMessagePaneWidth")); + if (!collapse) + { + // Restore conversation's pane previous width after expanding messages pane. + mConversationsPane->setTargetDim(prevRect.getWidth()); + } } - void LLIMFloaterContainer::collapseConversationsPane(bool collapse) { if (mConversationsPane->isCollapsed() == collapse) |