SL-18448 Make material editor's scroll smarter

3 files changed, 15 insertions, 14 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
index 317783f794..7759bc2399 100644
--- a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  can_resize="true"
  default_tab_group="1"
- height="786"
+ height="790"
  width="256"
  min_height="500"
  min_width="256"
@@ -14,10 +14,10 @@
  title="Editing Material">
   <scroll_container
    name="materials_scroll"
-   top="14"
+   top="18"
    left="4"
    height="768"
-   width="247"
+   width="250"
    follows="all"
    layout="topleft"
    color="DkGray2"
@@ -26,12 +26,12 @@
     <panel
      name="panel_material"
      filename="panel_gltf_material.xml"
-     border="false"
-     visible="true"
      layout="topleft"
+     follows="left|top|right"
+     border="false"
      top="0"
      left="0"
      height="768"
-     width="247" />
+     width="236" />
   </scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 29def9bd53..1a53d7832d 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  can_resize="true"
  default_tab_group="1"
- height="887"
+ height="891"
  width="256"
  min_height="500"
  min_width="256"
@@ -19,25 +19,26 @@
 
   <scroll_container
    name="materials_scroll"
-   top="14"
+   top="18"
    left="4"
    height="768"
-   width="247"
+   width="250"
    follows="all"
    layout="topleft"
    color="DkGray2"
    opaque="true"
+   border="false"
    reserve_scroll_corner="false">
     <panel
      name="panel_material"
      filename="panel_gltf_material.xml"
-     border="false"
-     visible="true"
      layout="topleft"
+     follows="left|top|right"
+     border="false"
      top="0"
      left="0"
      height="768"
-     width="247" />
+     width="236" />
   </scroll_container>
 
   <panel
diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index f4060648b9..2936b3cb63 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  layout="topleft"
- follows="all"
+ follows="left|top|right"
  border="false"
  name="panel_gltf_material"
  top="0"
@@ -129,7 +129,7 @@
      left_delta="0"
      name="alpha mode"
      top_pad="4"
-     width="96">
+     width="89">
       <combo_box.item
        label="Opaque"
        name="None"