diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2013-02-20 13:47:20 +0200 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2013-02-20 13:47:20 +0200 |
| commit | 8ed2072aa25a99d1da6c18de990bf155e65dc1ca (patch) | |
| tree | b39d399cfe95874399a55976b06618ff25990f71 /indra/newview | |
| parent | c48e644220ad1708a93987faf9ac96bcdd097dec (diff) | |
CHUI-768 ADD FIX Conversation panel resize issue with message panel collapse : correctly assign of a left panel resize limits
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 5213413aea..72febcf431 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -758,7 +758,9 @@ void LLFloaterIMContainer::assignResizeLimits() // between the panels are merged into one S32 number_of_visible_borders = llmin((is_conv_pane_expanded? 2 : 0) + (is_msg_pane_expanded? 2 : 0), 3); S32 summary_width_of_visible_borders = number_of_visible_borders * LLPANEL_BORDER_WIDTH; - S32 conv_pane_current_width = is_conv_pane_expanded? mConversationsPane->getRect().getWidth() : mConversationsPane->getMinDim(); + S32 conv_pane_current_width = is_msg_pane_expanded + ? mConversationsPane->getRect().getWidth() + : (is_conv_pane_expanded? mConversationsPane->getExpandedMinDim() : mConversationsPane->getMinDim()); S32 msg_pane_min_width = is_msg_pane_expanded ? mMessagesPane->getExpandedMinDim() : 0; S32 new_min_width = conv_pane_current_width + msg_pane_min_width + summary_width_of_visible_borders; |