made "more" link in LLExpandableTextBox localizable

fixed logic for showing/hiding "more" link in LLExpandableTextBox
fixed invisible background on combobox popup list

reviewed by Leyla

4 files changed, 40 insertions, 17 deletions

diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index 28c124d1c6..2467356018 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -45,7 +45,7 @@ public:
 	:	LLTextSegment(start, end),
 		mEditor(editor),
 		mStyle(style),
-		mMoreText(more_text)
+		mExpanderLabel(more_text)
 	{}
 
 	/*virtual*/ S32		getWidth(S32 first_char, S32 num_chars) const 
@@ -61,7 +61,15 @@ public:
 	/*virtual*/ F32		draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
 	{
 		F32 right_x;
-		mStyle->getFont()->renderUTF8(mMoreText, start, draw_rect.mRight, draw_rect.mTop, mStyle->getColor(), LLFontGL::RIGHT, LLFontGL::TOP, 0, mStyle->getShadowType(), end - start, draw_rect.getWidth(), &right_x, mEditor.getUseEllipses());
+		mStyle->getFont()->renderUTF8(mExpanderLabel, start, 
+									draw_rect.mRight, draw_rect.mTop, 
+									mStyle->getColor(), 
+									LLFontGL::RIGHT, LLFontGL::TOP, 
+									0, 
+									mStyle->getShadowType(), 
+									end - start, draw_rect.getWidth(), 
+									&right_x, 
+									mEditor.getUseEllipses());
 		return right_x;
 	}
 	/*virtual*/ S32		getMaxHeight() const { return llceil(mStyle->getFont()->getLineHeight()); }
@@ -75,14 +83,17 @@ public:
 private:
 	LLTextBase& mEditor;
 	LLStyleSP	mStyle;
-	std::string	mMoreText;
+	std::string	mExpanderLabel;
 };
 
-
+LLExpandableTextBox::LLTextBoxEx::Params::Params()
+:	more_label("more_label")
+{}
 
 LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p)
 :	LLTextBox(p),
-	mExpanded(false)
+	mExpanderLabel(p.more_label),
+	mExpanderVisible(false)
 {
 	setIsChrome(TRUE);
 
@@ -106,6 +117,9 @@ void LLExpandableTextBox::LLTextBoxEx::setValue(const LLSD& value)
 {
 	LLTextBox::setValue(value);
 
+	// text contents have changed, segments are cleared out
+	// so hide the expander and determine if we need it
+	//mExpanderVisible = false;
 	if (getTextPixelHeight() > getRect().getHeight())
 	{
 		showExpandText();
@@ -119,7 +133,7 @@ void LLExpandableTextBox::LLTextBoxEx::setValue(const LLSD& value)
 
 void LLExpandableTextBox::LLTextBoxEx::showExpandText()
 {
-	if (!mExpanded)
+	if (!mExpanderVisible)
 	{
 		// get fully visible lines
 		std::pair<S32, S32> visible_lines = getVisibleLines(true);
@@ -129,9 +143,9 @@ void LLExpandableTextBox::LLTextBoxEx::showExpandText()
 		expander_style.font.name.setIfNotProvided(LLFontGL::nameFromFont(expander_style.font));
 		expander_style.font.style = "UNDERLINE";
 		expander_style.color = LLUIColorTable::instance().getColor("HTMLLinkColor");
-		LLExpanderSegment* expanderp = new LLExpanderSegment(new LLStyle(expander_style), getLineStart(last_line), getLength() + 1, "More", *this);
+		LLExpanderSegment* expanderp = new LLExpanderSegment(new LLStyle(expander_style), getLineStart(last_line), getLength() + 1, mExpanderLabel, *this);
 		insertSegment(expanderp);
-		mExpanded = true;
+		mExpanderVisible = true;
 	}
 
 }
@@ -139,14 +153,14 @@ void LLExpandableTextBox::LLTextBoxEx::showExpandText()
 //NOTE: obliterates existing styles (including hyperlinks)
 void LLExpandableTextBox::LLTextBoxEx::hideExpandText() 
 { 
-	if (mExpanded)
+	if (mExpanderVisible)
 	{
 		// this will overwrite the expander segment and all text styling with a single style
 		LLNormalTextSegment* segmentp = new LLNormalTextSegment(
 											new LLStyle(getDefaultStyle()), 0, getLength() + 1, *this);
 		insertSegment(segmentp);
 		
-		mExpanded = false;
+		mExpanderVisible = false;
 	}
 }
 
@@ -275,6 +289,9 @@ S32 LLExpandableTextBox::recalculateTextDelta(S32 text_delta)
 
 void LLExpandableTextBox::expandTextBox()
 {
+	// hide "more" link, and show full text contents
+	mTextBox->hideExpandText();
+
 	S32 text_delta = mTextBox->getVerticalTextDelta();
 	text_delta += mTextBox->getVPad() * 2 + mScroll->getBorderWidth() * 2;
 	// no need to expand
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h
index b78a4dc674..d6401e224f 100644
--- a/indra/newview/llexpandabletextbox.h
+++ b/indra/newview/llexpandabletextbox.h
@@ -54,6 +54,8 @@ protected:
 	public:
 		struct Params :	public LLInitParam::Block<Params, LLTextBox::Params>
 		{
+			Mandatory<std::string> more_label;
+			Params();
 		};
 
 		// adds or removes "More" link as needed
@@ -76,11 +78,6 @@ protected:
 		 */
 		virtual S32 getHPad() { return mHPad; }
 
-	protected:
-
-		LLTextBoxEx(const Params& p);
-		friend class LLUICtrlFactory;
-
 		/**
 		 * Shows "More" link
 		 */
@@ -91,9 +88,15 @@ protected:
 		 */
 		void hideExpandText();
 
+	protected:
+
+		LLTextBoxEx(const Params& p);
+		friend class LLUICtrlFactory;
+
 	private:
+		std::string mExpanderLabel;
 
-		bool mExpanded;
+		bool mExpanderVisible;
 	};
 
 public:
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index d7369d0726..0dbca318b6 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -20,7 +20,9 @@
                               image_unselected="DropDown_Off"
                               image_selected="DropDown_Selected"
                               image_disabled="DropDown_Disabled" />
-  <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" />
+  <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
+                        background_visible="true"
+                         />
   <combo_box.combo_editor name="Combo Text Entry"
                           select_on_focus="true"
                           font="SansSerifSmall" />
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
index e470f42d36..6381dce1d6 100644
--- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
@@ -2,6 +2,7 @@
 <expandable_text
  max_height="300" >
  <textbox
+   more_label="More" 
   follows="left|top"
   name="text"
   use_ellipses="true"