diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-04-08 12:23:22 +0300 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-04-08 12:23:22 +0300 |
| commit | ea45bc05d4a464507c37efaec1da93aba068cd90 (patch) | |
| tree | ce14ef3712c4d197724ea74842967d464e204272 | |
| parent | 5c1563e2cbee162de52cee321edb8148016865ba (diff) | |
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
| -rw-r--r-- | indra/llui/lldraghandle.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llfloater.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 9d4e2fa495..9f83fcca35 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -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( diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index e672252a50..5fce1949a6 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -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); |