SL-19583 Uniform risizing for combination inventory view

1 files changed, 44 insertions, 70 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 5bc0113367..f772c1fde2 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -327,7 +327,7 @@
        follows="all"
        layout="topleft" />
     </panel>
-    <panel
+    <scroll_container
      follows="all"
      halign="center"
      height="372"
@@ -337,74 +337,48 @@
      top_delta="0"
      visible="false"
      width="312">
-     <layout_stack
-      follows="all"
-      height="372"
-      width="312"
-      animate="false"
-      drag_handle_gap="13"
-      drag_handle_thickness="6"
-      drag_handle_first_indent="18"
-      drag_handle_second_indent="18"
-      drag_handle_color="AddPaymentPanel"
-      drag_handle_shift="5"
-      show_drag_handle="true"
-      top="0"
-      left="0"
-      orientation="vertical">
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="246"
-        width="312"
-        min_width="150"
-        name="comb_gallery_layout">
-        <panel
-         class="inventory_gallery"
-         filename="panel_inventory_gallery.xml"
-         left="0"
-         top_pad="0"
-         height="246"
-         width="312"
-         name="comb_gallery_view_inv"
-         background_visible="true"
-         follows="all"
-         layout="topleft">
+           <panel
+            name="combination_scroller"
+            follows="all"
+            layout="topleft"
+            left="0"
+            top="0"
+            height="20"
+            width="291">
+            <panel
+             class="inventory_gallery"
+             filename="panel_inventory_gallery.xml"
+             follows="left|right"
+             layout="topleft"
+             left="0"
+             top="0"
+             height="10"
+             width="290"
+             name="comb_gallery_view_inv"
+             background_visible="true">
+            </panel>
+            <single_folder_inventory_panel
+             name="comb_single_folder_inv"
+             follows="left|right"
+             layout="topleft"
+             left="0"
+             top="200"
+             height="10"
+             width="290"
+             show_item_link_overlays="true"
+             bg_opaque_color="DkGray2"
+             bg_alpha_color="DkGray2"
+             background_visible="true"
+             border="false"
+             bevel_style="none"
+             scroll.reserve_scroll_corner="false">
+                <item
+                 single_folder_mode="true"
+                 folder_indentation="-8"/>
+                <folder
+                 single_folder_mode="true"
+                 folder_indentation="-8"/>
+            </single_folder_inventory_panel>
         </panel>
-       </layout_panel>
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="126"
-        width="312"
-        name="comb_inventory_layout">
-        <single_folder_inventory_panel
-         name="comb_single_folder_inv"
-         follows="all"
-         left="0"
-         top="1"
-         height="126"
-         width="312"
-         layout="topleft"
-         show_item_link_overlays="true"
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         border="false"
-         bevel_style="none"
-         scroll.reserve_scroll_corner="false">
-         <item
-          single_folder_mode="true"
-          folder_indentation="-8"/>
-         <folder
-          single_folder_mode="true"
-          folder_indentation="-8"/>
-        </single_folder_inventory_panel>
-       </layout_panel>
-     </layout_stack>
-    </panel>
+    </scroll_container>
 </panel>