Merge branch 'main' into DRTVWR-577-maint-S

2 files changed, 94 insertions, 0 deletions

diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index 8dd552d2ad..f73c9aa539 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -54,6 +54,10 @@ LLScrollListCell* LLScrollListCell::create(const LLScrollListCell::Params& cell_
 	{
 		cell = new LLScrollListIconText(cell_p);
 	}
+    else if (cell_p.type() == "bar")
+    {
+        cell = new LLScrollListBar(cell_p);
+    }
 	else	// default is "text"
 	{
 		cell = new LLScrollListText(cell_p);
@@ -174,6 +178,74 @@ void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_col
 }
 
 //
+// LLScrollListBar
+//
+LLScrollListBar::LLScrollListBar(const LLScrollListCell::Params& p)
+    :	LLScrollListCell(p),
+    mRatio(0),
+    mColor(p.color),
+    mBottom(1),
+    mLeftPad(1),
+    mRightPad(1)
+{}
+
+LLScrollListBar::~LLScrollListBar()
+{
+}
+
+/*virtual*/
+S32 LLScrollListBar::getHeight() const
+{ 
+    return LLScrollListCell::getHeight();
+}
+
+/*virtual*/
+const LLSD LLScrollListBar::getValue() const
+{ 
+    return LLStringUtil::null; 
+}
+
+void LLScrollListBar::setValue(const LLSD& value)
+{
+    if (value.has("ratio"))
+    {
+        mRatio = value["ratio"].asReal();
+    }
+    if (value.has("bottom"))
+    {
+        mBottom = value["bottom"].asInteger();
+    }
+    if (value.has("left_pad"))
+    {
+        mLeftPad = value["left_pad"].asInteger();
+    }
+    if (value.has("right_pad"))
+    {
+        mRightPad = value["right_pad"].asInteger();
+    }
+}
+
+void LLScrollListBar::setColor(const LLColor4& color)
+{
+    mColor = color;
+}
+
+S32	LLScrollListBar::getWidth() const 
+{
+    return LLScrollListCell::getWidth();
+}
+
+
+void LLScrollListBar::draw(const LLColor4& color, const LLColor4& highlight_color)	 const
+{
+    S32 bar_width = getWidth() - mLeftPad - mRightPad;
+    S32 left = bar_width - bar_width * mRatio;
+    left = llclamp(left, mLeftPad, getWidth() - mRightPad - 1);
+
+    gl_rect_2d(left, mBottom, getWidth() - mRightPad, mBottom - 1, mColor);
+}
+
+//
 // LLScrollListText
 //
 U32 LLScrollListText::sCount = 0;
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h
index ede8d847d9..2588da2331 100644
--- a/indra/llui/llscrolllistcell.h
+++ b/indra/llui/llscrolllistcell.h
@@ -33,6 +33,7 @@
 #include "lluistring.h"
 #include "v4color.h"
 #include "llui.h"
+#include "llgltexture.h"
 
 class LLCheckBoxCtrl;
 class LLSD;
@@ -159,6 +160,7 @@ public:
 
 	void			setText(const LLStringExplicit& text);
 	void			setFontStyle(const U8 font_style);
+    void			setAlignment(LLFontGL::HAlign align) { mFontAlignment = align; }
 
 protected:
 	LLUIString		mText;
@@ -199,6 +201,26 @@ private:
 	LLFontGL::HAlign		mAlignment;
 };
 
+
+class LLScrollListBar : public LLScrollListCell
+{
+public:
+    LLScrollListBar(const LLScrollListCell::Params& p);
+    /*virtual*/ ~LLScrollListBar();
+    /*virtual*/ void	draw(const LLColor4& color, const LLColor4& highlight_color) const;
+    /*virtual*/ S32		getWidth() const;
+    /*virtual*/ S32		getHeight() const;
+    /*virtual*/ const LLSD		getValue() const;
+    /*virtual*/ void	setColor(const LLColor4&);
+    /*virtual*/ void	setValue(const LLSD& value);
+
+private:
+    LLColor4                    mColor;
+    F32                         mRatio;
+    S32                         mBottom;
+    S32                         mRightPad;
+    S32                         mLeftPad;
+};
 /*
  * An interactive cell containing a check box.
  */