diff options
| author | Palmer <palmer@lindenlab.com> | 2010-03-05 13:11:26 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-03-05 13:11:26 -0800 |
| commit | b70951ca1e319e4d4a427a559072ee722588e1ed (patch) | |
| tree | 59f8edc208a98a3f74586a0458417a1ce14c00ff /indra/llui/llscrolllistctrl.cpp | |
| parent | dd663449b6f8b802892e11fab7cc2cbce36f734f (diff) | |
| parent | 32aa06139e6fb5f2e84d3e657dfbe8961170a804 (diff) | |
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; |