diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-02 12:51:39 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-02 12:51:39 -0400 |
commit | 5faa2444f91a65b3dfcd2047e578a54226be8577 (patch) | |
tree | 05b7468bc6b721d8f8e90cbb77a8f2f8a74ba152 /indra/llui/lldraghandle.cpp | |
parent | a3ba5836f0b24a0b2c3aeff3b97bb88a133ea69c (diff) | |
parent | a7085418df1ada6e19b94b6df772ed21e663d119 (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 |