diff options
| author | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
| commit | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch) | |
| tree | 0c471654bd00737375e91f040d758716c82bffb2 /indra/llui/llscrolllistctrl.cpp | |
| parent | f39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff) | |
| parent | 2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff) | |
Local merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 77caaaa425..18ec5b51dd 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -630,7 +630,9 @@ void LLScrollListCtrl::calcColumnWidths() LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex); if (!cellp) continue; - column->mMaxContentWidth = llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth); + // get text value width only for text cells + column->mMaxContentWidth = cellp->isText() ? + llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth) : column->mMaxContentWidth; } max_item_width += column->mMaxContentWidth; |