summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloatercontainer.cpp
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-08-20 17:54:33 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-08-20 17:54:33 +0300
commit2097e61dcb6865ad4c5b6667c9032f2cef658bd6 (patch)
treee956ed6160e025928e9fcb0a10e0baebfe75cbf1 /indra/newview/llimfloatercontainer.cpp
parent0fc67126fe1c082caf640cba6b63ce9a0438cc23 (diff)
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
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
-rw-r--r--indra/newview/llimfloatercontainer.cpp8
1 files changed, 8 insertions, 0 deletions
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()