diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-05 11:08:30 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-05 11:08:30 -0800 |
| commit | 5eb5602220bf65804ddccd8ce7d455a1487fbb39 (patch) | |
| tree | 6c7440c82b1daeeca4d908cf9d163e882de76c65 /indra/llui/llscrolllistctrl.cpp | |
| parent | 8e4aa522b2b0c71321cb90c029ca071346985b6d (diff) | |
| parent | b9a96aaeb3aaf4a5e30364ddcba5af40cceb3e83 (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; |