diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-10-01 22:21:37 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 14:49:39 +0300 |
| commit | af7cefe031b0680253c7b0c082216af841a10939 (patch) | |
| tree | 3c5409b2d3f40e07e5de62a79ef65744a90c0a5f /indra/llui/llscrolllistcell.cpp | |
| parent | 0147a8c989b2bd423077aa8a416298b33bde9dcf (diff) | |
SL-6109 Cell selection support
Diffstat (limited to 'indra/llui/llscrolllistcell.cpp')
| -rw-r--r-- | indra/llui/llscrolllistcell.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp index d6627a6957..13839da400 100644 --- a/indra/llui/llscrolllistcell.cpp +++ b/indra/llui/llscrolllistcell.cpp @@ -172,7 +172,7 @@ U32 LLScrollListText::sCount = 0; LLScrollListText::LLScrollListText(const LLScrollListCell::Params& p) : LLScrollListCell(p), - mText(p.text.isProvided() ? p.text() : p.value().asString()), + mText(p.label.isProvided() ? p.label() : p.value().asString()), mFont(p.font), mColor(p.color), mUseColor(p.color.isProvided()), @@ -199,13 +199,6 @@ void LLScrollListText::highlightText(S32 offset, S32 num_chars) mHighlightCount = llmax(0, num_chars); } -//virtual -void LLScrollListText::setHighlighted(bool highlighted) -{ - mHighlightOffset = 0; - mHighlightCount = highlighted ? -1 : 0; -} - //virtual BOOL LLScrollListText::isText() const { @@ -323,15 +316,6 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col 1); mRoundedRectImage->draw(highlight_rect, highlight_color); } - else if (mHighlightCount < 0) - { - // Highlight whole cell - LLRect highlight_rect(0, - getHeight(), - getWidth() - 1, - -1); - gl_rect_2d(highlight_rect, LLColor4(0.38f, 0.694f, 0.573f, 0.35f)); - } // Try to draw the entire string F32 right_x; |