diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
| commit | db0ffdf270f9f9b656333e317a0cf6fadc14a711 (patch) | |
| tree | 6008b6b3c36dd9cd6bd7e51d63aea7210396e7bf /indra/llui/lldraghandle.cpp | |
| parent | 959ec0c305914ac71caa12920ca81230d5d9a6c4 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
Merge
Diffstat (limited to 'indra/llui/lldraghandle.cpp')
| -rw-r--r-- | indra/llui/lldraghandle.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 832f148902..9d4e2fa495 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -248,15 +248,14 @@ void LLDragHandleTop::reshapeTitleBox() return; } const LLFontGL* font = LLFontGL::getFontSansSerif(); - S32 title_width = font->getWidth( mTitleBox->getText() ) + TITLE_HPAD; - if (getMaxTitleWidth() > 0) - title_width = llmin(title_width, getMaxTitleWidth()); + S32 title_width = getRect().getWidth(); + title_width -= 2 * LEFT_PAD + 2 * BORDER_PAD + getButtonsRect().getWidth(); S32 title_height = llround(font->getLineHeight()); LLRect title_rect; title_rect.setLeftTopAndSize( LEFT_PAD, getRect().getHeight() - title_vpad, - getRect().getWidth() - LEFT_PAD - RIGHT_PAD, + title_width, title_height); // calls reshape on mTitleBox |