#5564 use additional common background to avoid scaling issues

5 files changed, 33 insertions, 16 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 207aa438d7..1f4b12fc91 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -174,8 +174,8 @@ with the same filename but different name
   <texture name="ComboButton_On" file_name="widgets/ComboButton_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="ComboButton_White" file_name="widgets/ComboButton_white.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_Arrow" file_name="widgets/ComboButton_Arrow.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Transparent" file_name="widgets/ComboButton_Transparent.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
 
   <texture name="Container" file_name="containers/Container.png" preload="false" />
 
@@ -721,7 +721,7 @@ with the same filename but different name
   <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Highlight" file_name="widgets/TextField_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Search_Highlight" file_name="widgets/TextField_Search_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
-  <texture name="Text_Field_Cropped" file_name="widgets/Text_Field_Cropped.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="TextField_Transparent" file_name="widgets/TextField_Transparent.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
 
   <texture name="Thumbnail_Fallback" file_name="icons/thumbnail_fallback_icon.png" preload="true" />
 
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Transparent.png b/indra/newview/skins/default/textures/widgets/ComboButton_Transparent.png
new file mode 100644
index 0000000000..4b978877e1
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Transparent.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_white.png b/indra/newview/skins/default/textures/widgets/TextField_Transparent.png
index 5c93700186..1735184387 100644
--- a/indra/newview/skins/default/textures/widgets/ComboButton_white.png
+++ b/indra/newview/skins/default/textures/widgets/TextField_Transparent.png
diff --git a/indra/newview/skins/default/textures/widgets/Text_Field_Cropped.png b/indra/newview/skins/default/textures/widgets/Text_Field_Cropped.png
deleted file mode 100644
index e5de6474f4..0000000000
--- a/indra/newview/skins/default/textures/widgets/Text_Field_Cropped.png
+++ /dev/null
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index ca03d2dbc5..77fcb25692 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -78,9 +78,18 @@
            left="70"
            top="39"
            name="sl_logo_small" />
-          <combo_box
+          <icon
            left="40"
            top_pad="30"
+           width="220"
+           height="28"
+           image_name="TextField_Active"
+           layout="topleft"
+           follows="left|top"
+           name="text_field_bg1" />
+          <combo_box
+           left="40"
+           top_delta="0"
            allow_text_entry="true"
            follows="left|top"
            layout="topleft"
@@ -96,14 +105,14 @@
               <combo_box.combo_button
                image_overlay="ComboButton_Arrow"
                image_overlay_right_delta="10"
-               image_unselected="ComboButton_White"
+               image_unselected="ComboButton_Transparent"
                hover_glow_amount="0"
-               image_selected="ComboButton_White"
-               image_disabled="ComboButton_White" />
+               image_selected="ComboButton_Transparent"
+               image_disabled="ComboButton_Transparent" />
               <combo_box.combo_editor
-               background_image="Text_Field_Cropped"
-               background_image_disabled="Text_Field_Cropped"
-               background_image_focused="Text_Field_Cropped"
+               background_image="TextField_Transparent"
+               background_image_disabled="TextField_Transparent"
+               background_image_focused="TextField_Transparent"
                draw_focus_border="false"
                text_pad_left="8"
                bg_image_always_focused="true"/>
@@ -173,6 +182,14 @@
            valign="center">
            Start here
           </text>
+          <icon
+           top_pad="6"
+           width="220"
+           height="28"
+           image_name="TextField_Active"
+           layout="topleft"
+           follows="left|top"
+           name="text_field_bg2" />
           <combo_box
            allow_text_entry="true"
            control_name="NextLoginLocation"
@@ -181,7 +198,7 @@
            height="28"
            max_chars="128"
            combo_editor.font="SansSerifLarge"
-           top_pad="6"
+           top_delta="0"
            name="start_location_combo"
            width="220"
            combo_button.scale_image="true">
@@ -189,13 +206,13 @@
                image_overlay="ComboButton_Arrow"
                hover_glow_amount="0"
                image_overlay_right_delta="10"
-               image_unselected="ComboButton_White"
-               image_selected="ComboButton_White"
-               image_disabled="ComboButton_White" />
+               image_unselected="ComboButton_Transparent"
+               image_selected="ComboButton_Transparent"
+               image_disabled="ComboButton_Transparent" />
               <combo_box.combo_editor
-               background_image="Text_Field_Cropped"
-               background_image_disabled="Text_Field_Cropped"
-               background_image_focused="Text_Field_Cropped"
+               background_image="TextField_Transparent"
+               background_image_disabled="TextField_Transparent"
+               background_image_focused="TextField_Transparent"
                draw_focus_border="false"
                text_pad_left="8"
                bg_image_always_focused="true"/>