From 00f66ccf409b0f7fb974f23cd157cdd0b8a6ab96 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 22 Sep 2011 15:08:59 -0700
Subject: EXP-1239 WIP make toolbars wrap when there is not enough room added
 more toolbars to floater_test_toolbar.xml removed layout stack and got basic
 wrapping working reviewed by Leslie

---
 indra/llui/lltoolbar.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'indra/llui/lltoolbar.h')

diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index 3a593e42d9..31729e32b4 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -93,8 +93,8 @@ public:
 												button_icon_and_text;
 
 		Optional<bool>							wrap;
-		Optional<S32>							min_width,
-												max_width;
+		Optional<S32>							min_button_width,
+												max_button_width;
 		// get rid of this
 		Multiple<LLToolBarButton::Params>		buttons;
 
@@ -112,11 +112,9 @@ protected:
 	LLToolBar(const Params&);
 
 	void initFromParams(const Params&);
-	void addButton(LLToolBarButton* buttonp);
-	void updateLayout();
 
 private:
-	void addRow();
+	void updateLayoutAsNeeded();
 
 	std::list<LLToolBarButton*>		mButtons;
 	LLToolBarEnums::ButtonType		mButtonType;
@@ -125,11 +123,10 @@ private:
 	LLLayoutPanel*					mCenterPanel;
 	LLToolBarEnums::SideType		mSideType;
 
-	std::vector<LLLayoutStack*>		mStacks;
 	bool							mWrap;
 	bool							mNeedsLayout;
-	S32								mMinWidth,
-									mMaxWidth;
+	S32								mMinButtonWidth,
+									mMaxButtonWidth;
 
 	LLUIImagePtr					mBackgroundImage;
 };
-- 
cgit v1.2.3