diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-18 15:04:23 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-18 15:04:23 -0700 |
| commit | 86ac47474f42598d3edb65970117b442457f7284 (patch) | |
| tree | 193b23bdc0aacb212bee033505633f3584089d60 | |
| parent | 80004efa6c99a9a3a6aff66b89a4921c9eadf412 (diff) | |
Regress Fix: After a CHUI 283 commit the inventory items suffix was overlapping text. Problem was that a variable storing the width of the text was not passed in as a reference, which always resulted in the suffix overlapping the prior text.
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 4 | ||||
| -rwxr-xr-x | indra/llui/llfolderviewitem.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 5fcb1f51d1..a20ce23b18 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -689,7 +689,7 @@ void LLFolderViewItem::drawHighlight(const BOOL showContent, const BOOL hasKeybo } } -void LLFolderViewItem::drawLabel(const LLFontGL * font, const F32 x, const F32 y, const LLColor4& color, F32 right_x) +void LLFolderViewItem::drawLabel(const LLFontGL * font, const F32 x, const F32 y, const LLColor4& color, F32 &right_x) { //TODO RN: implement this in terms of getColor() //if (highlight_link) color = sLinkColor; @@ -797,7 +797,7 @@ void LLFolderViewItem::draw() LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, &right_x, FALSE ); } - + //--------------------------------------------------------------------------------// // Highlight string match // diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index a9e10c92c9..5c97407bc1 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -237,7 +237,7 @@ public: // virtual void handleDropped(); virtual void draw(); void drawHighlight(const BOOL showContent, const BOOL hasKeyboardFocus, const LLUIColor &bgColor, const LLUIColor &outlineColor, const LLUIColor &mouseOverColor); - void drawLabel(const LLFontGL * font, const F32 x, const F32 y, const LLColor4& color, F32 right_x); + void drawLabel(const LLFontGL * font, const F32 x, const F32 y, const LLColor4& color, F32 &right_x); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, |