livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed low bug EXT-5568 (The Speak button label hides after bottom tray width decreased.) 

--HG--
branch : product-engine
meow-7.2.2
Eugene Mutavchi 2010-02-19 19:51:07 +02:00
parent 6a3ea6fa61
commit 0b8be887de
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llbottomtray.cpp
View File

@ -926,13 +926,12 @@ void LLBottomTray::processShrinkButtons(S32* required_width, S32* buttons_freed_
}
else
{
//
mSpeakBtn->setLabelVisible(false);
S32 panel_width = mSpeakPanel->getRect().getWidth();
S32 possible_shrink_width = panel_width - panel_min_width;
if (possible_shrink_width > 0)
{
mSpeakBtn->setLabelVisible(false);
mSpeakPanel->reshape(panel_width - possible_shrink_width, mSpeakPanel->getRect().getHeight());
*required_width += possible_shrink_width;
@ -1007,11 +1006,11 @@ void LLBottomTray::processExtendButtons(S32* available_width)
if (*available_width > 0)
{
processExtendButton(RS_BUTTON_CAMERA, available_width);
processExtendButton(RS_BUTTON_MOVEMENT, available_width);
}
if (*available_width > 0)
{
processExtendButton(RS_BUTTON_MOVEMENT, available_width);
processExtendButton(RS_BUTTON_CAMERA, available_width);
}
if (*available_width > 0)
{
@ -1211,8 +1210,8 @@ bool LLBottomTray::setVisibleAndFitWidths(EResizeState object_type, bool visible
if ( (available_width + possible_shrunk_width) >= minimal_width)
{
// There is enough space for minimal width, but set the result_width
// to current_width so buttons widths decreasing will be done in predefined order
result_width = current_width;
// to preferred_width so buttons widths decreasing will be done in predefined order
result_width = (preferred_width > 0) ? preferred_width : current_width;
decrease_width = true;
}
else

2
indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
View File

@ -9,7 +9,7 @@
top="21"
width="310">
<string name="min_width">
188
216
</string>
<string name="max_width">
320