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

EXT-6733(normal) - Long title of voice popup notification is displayed out of window. 

Fixed code calculating title buttons rectangle, LLRect::isValid() does not indicate uninitialized rectangle, as a result rectangle was not properly initialized and had negative width.
Fixed title width.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/194/

--HG--
branch : product-engine
master
Dmitry Zaporozhan 2010-04-08 12:23:22 +03:00
parent 5c1563e2cb
commit ea45bc05d4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/lldraghandle.cpp
View File

@ -249,7 +249,7 @@ void LLDragHandleTop::reshapeTitleBox()
}
const LLFontGL* font = LLFontGL::getFontSansSerif();
S32 title_width = getRect().getWidth();
title_width -= 2 * LEFT_PAD + 2 * BORDER_PAD + getButtonsRect().getWidth();
title_width -= LEFT_PAD + 2 * BORDER_PAD + getButtonsRect().getWidth();
S32 title_height = llround(font->getLineHeight());
LLRect title_rect;
title_rect.setLeftTopAndSize(

7
indra/llui/llfloater.cpp
View File

@ -1786,13 +1786,16 @@ void LLFloater::updateTitleButtons()
llround((F32)floater_close_box_size * mButtonScale));
}
if(!buttons_rect.isValid())
// first time here, init 'buttons_rect'
if(1 == button_count)
{
buttons_rect = btn_rect;
}
else
{
mDragOnLeft ? buttons_rect.mRight + btn_rect.mRight :
// if mDragOnLeft=true then buttons are on top-left side vertically aligned
// title is not displayed in this case, calculating 'buttons_rect' for future use
mDragOnLeft ? buttons_rect.mBottom -= btn_rect.mBottom :
buttons_rect.mLeft = btn_rect.mLeft;
}
mButtons[i]->setRect(btn_rect);