svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134

1 files changed, 43 insertions, 10 deletions

diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index ff17d2874f..6e77007aef 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -80,6 +80,7 @@ public:
 
 	virtual void	draw();
 	virtual void	onFocusLost();
+	virtual void	onLostTop();
 
 	virtual void	setEnabled(BOOL enabled);
 
@@ -107,10 +108,11 @@ public:
 	void			setAllowTextEntry(BOOL allow, S32 max_chars = 50, BOOL make_tentative = TRUE);
 	void			setTextEntry(const LLStringExplicit& text);
 
-	void			add(const LLString& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);	// add item "name" to menu
-	void			add(const LLString& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
-	void			add(const LLString& name, void* userdata, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
-	void			add(const LLString& name, LLSD value, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+	LLScrollListItem*	add(const LLString& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);	// add item "name" to menu
+	LLScrollListItem*	add(const LLString& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+	LLScrollListItem*	add(const LLString& name, void* userdata, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+	LLScrollListItem*	add(const LLString& name, LLSD value, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+	LLScrollListItem*	addSeparator(EAddPosition pos = ADD_BOTTOM);
 	BOOL			remove( S32 index );	// remove item by index, return TRUE if found and removed
 	void			removeall() { clearRows(); }
 
@@ -119,9 +121,9 @@ public:
 	// Select current item by name using selectSimpleItem.  Returns FALSE if not found.
 	BOOL			setSimple(const LLStringExplicit& name);
 	// Get name of current item. Returns an empty string if not found.
-	const LLString&	getSimple() const;
+	const LLString	getSimple() const;
 	// Get contents of column x of selected row
-	const LLString& getSimpleSelectedItem(S32 column = 0) const;
+	const LLString getSimpleSelectedItem(S32 column = 0) const;
 
 	// Sets the label, which doesn't have to exist in the label.
 	// This is probably a UI abuse.
@@ -132,6 +134,8 @@ public:
 	BOOL			setCurrentByIndex( S32 index );
 	S32				getCurrentIndex() const;
 
+	virtual void	updateLayout();
+
 	//========================================================================
 	LLCtrlSelectionInterface* getSelectionInterface()	{ return (LLCtrlSelectionInterface*)this; };
 	LLCtrlListInterface* getListInterface()				{ return (LLCtrlListInterface*)this; };
@@ -172,7 +176,6 @@ public:
 
 	static void		onButtonDown(void *userdata);
 	static void		onItemSelected(LLUICtrl* item, void *userdata);
-	static void		onListFocusChanged(LLUICtrl* item, void *userdata);
 	static void		onTextEntry(LLLineEditor* line_editor, void* user_data);
 	static void		onTextCommit(LLUICtrl* caller, void* user_data);
 
@@ -183,12 +186,10 @@ public:
 protected:
 	LLButton*			mButton;
 	LLScrollListCtrl*	mList;
+	S32					mButtonPadding;
 	LLViewBorder*		mBorder;
-	BOOL				mKeyboardFocusOnClick;
-	BOOL				mDrawArrow;
 	LLLineEditor*		mTextEntry;
 	LLPointer<LLImageGL>	mArrowImage;
-	S32					mArrowImageWidth;
 	BOOL				mAllowTextEntry;
 	S32					mMaxChars;
 	BOOL				mTextEntryTentative;
@@ -197,4 +198,36 @@ protected:
 	void				(*mTextEntryCallback)(LLLineEditor*, void*);
 };
 
+class LLFlyoutButton : public LLComboBox
+{
+public:
+	LLFlyoutButton(
+		const LLString& name, 
+		const LLRect &rect,
+		const LLString& label,
+		void (*commit_callback)(LLUICtrl*, void*) = NULL,
+		void *callback_userdata = NULL);
+
+	virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLYOUT_BUTTON; }
+	virtual LLString getWidgetTag() const { return LL_FLYOUT_BUTTON_TAG; }
+
+	virtual void	updateLayout();
+	virtual void	draw();
+	virtual void	setEnabled(BOOL enabled);
+
+	void setToggleState(BOOL state);
+
+	static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+	static void		onActionButtonClick(void *userdata);
+	static void		onSelectAction(LLUICtrl* ctrl, void *userdata);
+
+protected:
+	LLButton*				mActionButton;
+	LLPointer<LLUIImage>	mActionButtonImage;
+	LLPointer<LLUIImage>	mExpanderButtonImage;
+	LLPointer<LLUIImage>	mActionButtonImageSelected;
+	LLPointer<LLUIImage>	mExpanderButtonImageSelected;
+	BOOL					mToggleState;
+};
+
 #endif