From c155483fc206768e21d180fac9ccdd85db8f582e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 22 Sep 2011 17:34:42 -0700
Subject: EXP-1239 WIP make toolbars wrap when there is not enough room toolbar
 button height configured by button_height attribute vertical toolbar buttons
 now share common width wrap attribute now controls wrapping

---
 .../skins/default/xui/en/floater_test_toolbar.xml  | 10 ++++++----
 .../skins/default/xui/en/widgets/toolbar.xml       | 23 ++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 85f0f104fc..da964b88e2 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -13,13 +13,16 @@
            width="500"
            left="0"
            top="20"
-           min_width="100"
+           min_button_width="0"
+           max_button_width="100"
            side="top">
     <button auto_resize="true"
+            use_ellipses="true"
             label="Button"/>
     <button auto_resize="true"
             label="Button with long label"/>
     <button auto_resize="true"
+            use_ellipses="true"
             label="Button with longest label of all"/>
   </toolbar>
   <toolbar name="test_toolbar_left"
@@ -28,7 +31,7 @@
            width="100"
            left="0"
            top="70"
-           min_width="100"           
+           min_button_width="100"           
            side="left">
     <button height="30"
             label="Button"/>
@@ -43,7 +46,6 @@
            width="100"
            right="500"
            top="70"
-           min_width="100"
            side="right">
     <button auto_resize="true"
             label="Button 1"/>
@@ -58,7 +60,7 @@
            width="500"
            left="0"
            bottom="500"
-           min_width="100"
+           min_button_width="100"
            side="bottom">
     <button auto_resize="true"
             label="Button"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index a7f73c0c7c..f9cc9b7c69 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toolbar background_image = "Rounded_Rect">
-  <button_icon_and_text
-    follows="none"
-    height="30"
-    chrome="true"
-    auto_resize="true"
-    />
-  <button_icon
-  follows="none"
-  height="30"
-  chrome="true"
-  auto_resize="true"
-    />
+<toolbar background_image = "Rounded_Rect"
+         button_height="30">
+  <button_icon_and_text follows="none"
+                        chrome="true"
+                        use_ellipses="true"
+                        auto_resize="true"/>
+  <button_icon follows="none"
+               chrome="true"
+               use_ellipses="true"
+               auto_resize="true"/>
 </toolbar>
-- 
cgit v1.2.3


From b6d7f99f065c87f7409a1e5e1ba1b59f3f4a3efb Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 23 Sep 2011 17:01:15 -0700
Subject: EXP-1239 FIX make toolbars wrap when there is not enough room spacing
 between buttons now configurable and correct background art now wraps buttons
 correctly created customizable panel for button background

---
 .../skins/default/xui/en/floater_test_toolbar.xml       |  4 ++--
 indra/newview/skins/default/xui/en/widgets/toolbar.xml  | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index da964b88e2..b58c006b3f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -28,7 +28,7 @@
   <toolbar name="test_toolbar_left"
            follows="left|bottom|top"
            height="380"
-           width="100"
+           width="200"
            left="0"
            top="70"
            min_button_width="100"           
@@ -43,7 +43,7 @@
   <toolbar name="test_toolbar_right"
            follows="right|bottom|top"
            height="380"
-           width="100"
+           width="200"
            right="500"
            top="70"
            side="right">
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index f9cc9b7c69..45210277b2 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toolbar background_image = "Rounded_Rect"
-         button_height="30">
-  <button_icon_and_text follows="none"
+<toolbar button_height="30"
+         pad_left="5"
+         pad_right="5"
+         pad_top="5"
+         pad_bottom="5"
+         pad_between="5">
+
+  <button_panel name="button_panel"
+                bg_opaque_image="Rounded_Rect"
+                background_visible="true"
+                background_opaque="true"/>
+  <button_icon_and_text follows="left|top"
                         chrome="true"
                         use_ellipses="true"
                         auto_resize="true"/>
-  <button_icon follows="none"
+  <button_icon follows="left|top"
                chrome="true"
                use_ellipses="true"
                auto_resize="true"/>
-- 
cgit v1.2.3