From 3eeb14ee0abb5720e010d94eba52db09fa32237e Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Fri, 10 Jun 2011 16:20:30 -0700
Subject: EXP-856 FIX -- Inbox item count reflected as badge on inventory
 button

* Modified badges to be parented to their owners if their owners have no parents
* Modified side tray tab panels to create badges on side tab buttons when the
  xml specifies a badge.
* Modified inbox to drive the badge value of the sidebar_inventory button.
* Updated inbox and outbox sizes so scroll bars function as expected
* Updated inventory_panel.xml to allow scroll tag to specify scroll bar
  properties, instead of just having them hardcoded.

Reviewed by Richard
---
 .../skins/default/xui/en/panel_side_tray.xml       |   1 +
 .../skins/default/xui/en/sidepanel_inventory.xml   | 125 +++++++++++----------
 .../default/xui/en/widgets/inventory_panel.xml     |   9 +-
 3 files changed, 74 insertions(+), 61 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 6ef93406ec..0f330a7b98 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -142,6 +142,7 @@
     mouse_opaque="false"
     background_visible="true"
   >
+      <badge location="top_left" location_percent_vcenter="50" location_percent_hcenter="95" />
       <panel
         class="sidepanel_inventory"
         name="sidepanel_inventory"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index c945f27ac6..373a9011a1 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,13 +26,13 @@
               top="0"
               orientation="vertical"
               name="inventory_layout_stack"
-             height="535"
+              height="535"
               width="330">
              <layout_panel
                  name="main_inventory_layout_panel"
                  min_dim="150"
                  width="330"
-                  follows="bottom|left|right"
+                 follows="bottom|left|right"
                  user_resize="false"
                  height="480">
                  <panel
@@ -50,12 +50,12 @@
              <layout_panel
                  width="330"
                  auto_resize="true"
-                user_resize="false"
-                  follows="bottom|left|right"
+                 user_resize="false"
+                 follows="bottom|left|right"
                  min_dim="35"
                  name="inbox_layout_panel"
                  max_dim="125"
-                 height="35">
+                 height="125">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -69,59 +69,62 @@
                      <string name="InboxLabelWithArg">MARKETPLACE INBOX ([NUM])</string>
                      <string name="InboxLabelNoArg">MARKETPLACE INBOX</string>
                      <button
-                         label="MARKETPLACE INBOX"
-                         name="inbox_btn"
-                         height="35"
-                         width="308"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         halign="left"
-                         follows="top|left|right"
-                         is_toggle="true"
-                         tab_stop="false"
-                         pad_left="35"
-                         top="0"
+                        label="MARKETPLACE INBOX"
+                        name="inbox_btn"
+                        height="35"
+                        width="308"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
                         left="10" />
-                         <panel
-                             follows="all"
-                             left="10"
-                             height="90"
-                             width="308"
-                             top="35"
-                             bg_opaque_color="InventoryBackgroundColor"
-                             background_visible="true"
-                             background_opaque="true"
-                           >
-                             <text
-                                 type="string"
-                                 length="1"
-                                 follows="top|left|right"
-                                 font="SansSerifSmall"
-                                 use_ellipses="true"
-                                 name="move_items_text"
-                                 top="10"
-                                 left="4"
-                                 height="20"
-                                 width="304"
-                                 >Move items to your inventory to manage and use them.</text>
-                             <inventory_panel
-                                bg_opaque_color="DkGray2"
-                                bg_alpha_color="DkGray2"
-                                background_visible="true"
-                                background_opaque="true"
-                                border="false"
-                                bevel_style="none"
-                                follows="all"
-                                height="70"
-                                start_folder="Inbox"
-                                layout="topleft"
-                                left="0"
-                                name="inventory_inbox"
-                                sort_order_setting="InventorySortOrder"
-                                show_item_link_overlays="true"
-                                top_pad="0"
-                                width="308" />   
-                         </panel>
+                     <panel
+                        follows="all"
+                        left="10"
+                        height="90"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                    >
+                        <text
+                            type="string"
+                            length="1"
+                            follows="top|left|right"
+                            font="SansSerifSmall"
+                            use_ellipses="true"
+                            name="move_items_text"
+                            top="5"
+                            left="4"
+                            height="20"
+                            width="304"
+                            >Move items to your inventory to manage and use them.</text>
+                        <inventory_panel
+                            bg_opaque_color="DkGray2"
+                            bg_alpha_color="DkGray2"
+                            background_visible="true"
+                            background_opaque="true"
+                            border="false"
+                            bevel_style="none"
+                            follows="all"
+                            top="25"
+                            height="70"
+                            start_folder="Inbox"
+                            layout="topleft"
+                            left="0"
+                            name="inventory_inbox"
+                            sort_order_setting="InventorySortOrder"
+                            show_item_link_overlays="true"
+                            top_pad="0"
+                            width="308">
+                            <scroll reserve_scroll_corner="false" />
+                        </inventory_panel>
+                    </panel>
                  </panel>
              </layout_panel>
              <layout_panel
@@ -132,7 +135,7 @@
                 name="outbox_layout_panel"
                 min_dim="35"
                 max_dim="125"
-                height="35">
+                height="125">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -200,7 +203,7 @@
                      <panel
                          follows="all"
                          left="0"
-                         height="90"
+                         bottom="125"
                          width="330"
                          top="35"
                            >
@@ -220,7 +223,9 @@
                               sort_order_setting="InventorySortOrder"
                               show_item_link_overlays="true"
                               top="0"
-                              width="308" />
+                              width="308">
+                             <scroll reserve_scroll_corner="false" />
+                         </inventory_panel>
                      </panel>
 
                  </panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
index 93875d66e6..3164cc5eba 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -3,4 +3,11 @@
   bg_opaque_color="InventoryBackgroundColor"
   background_visible="true"
   background_opaque="true"
-  />
+  >
+    <scroll
+		name="Inventory Scroller"
+        follows="all"
+		reserve_scroll_corner="true"
+        tab_stop="true"
+        />
+</panel>
-- 
cgit v1.2.3