diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-13 17:00:26 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-13 17:00:26 +0300 |
| commit | 7da24ddaa3813f7b409b51ed5d330c7609b4f8a9 (patch) | |
| tree | cba100da1ffddf4e5222ff497b9a2f2db36c5068 /indra/newview | |
| parent | 8c0fcf0e391ff5db78f95f031562eedec998f164 (diff) | |
CHUI-332 [Overlap of icons in chrome when collapsing and expanding conversation list]: force header resizing after show/hide minimize button
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index b70305a4e9..a1bd623ac5 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -492,6 +492,13 @@ 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); + // force set correct size for the title after show/hide minimize button + LLRect cur_rect = getRect(); + LLRect force_rect = cur_rect; + force_rect.mRight = cur_rect.mRight + 1; + setRect(force_rect); + setRect(cur_rect); + // restore floater's resize limits (prevent collapse when left panel is expanded) if (is_left_pane_expanded && !is_right_pane_expanded) { diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 1583add857..413e66738d 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -36,7 +36,7 @@ name="conversations_layout_panel" min_dim="38" width="268" - expanded_min_dim="165"> + expanded_min_dim="120"> <layout_stack animate="false" follows="left|top|right" |