From 2097e61dcb6865ad4c5b6667c9032f2cef658bd6 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Mon, 20 Aug 2012 17:54:33 +0300 Subject: CHUI-302 FIXED (User can resize conversation list too small with message panel collapsed) set floater's resize limits from a left panel's limits --- indra/newview/llimfloatercontainer.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 450717e624..6b7912205e 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -402,6 +402,14 @@ void LLIMFloaterContainer::updateState(bool collapse, S32 delta_width) setCanResize(is_left_pane_expanded || is_right_pane_expanded); setCanMinimize(is_left_pane_expanded || is_right_pane_expanded); + + // restore floater's resize limits (prevent collapse when left panel is expanded) + if (is_left_pane_expanded && !is_right_pane_expanded) + { + S32 expanded_min_size = mConversationsPane->getExpandedMinDim(); + setResizeLimits(expanded_min_size, expanded_min_size); + } + } void LLIMFloaterContainer::onAddButtonClicked() -- cgit v1.2.3