Skip to content
Snippets Groups Projects
Commit 26d2a5fe authored by Erica's avatar Erica
Browse files

EXT-4061 Right top tab - art does not scale properly, appears blurry, ... 

EXT-4061 Right top tab - art does not scale properly, appears blurry,   EXT-4042 Appearance layout tweaks, Add (unsaved) thingamajig to the end of the Outfit name for Nyx
parent 3083ab69
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/textures/textures.xml
+ 2
− 3
View file @ 26d2a5fe
...@@ -552,9 +552,9 @@ with the same filename but different name ...@@ -552,9 +552,9 @@ with the same filename but different name
<texture name="TabTop_Divider" file_name="containers/TabTop_Divider.png" preload="false" /> <texture name="TabTop_Divider" file_name="containers/TabTop_Divider.png" preload="false" />
<texture name="TabTop_Left_Press" file_name="containers/TabTop_Left_Press.png" preload="false" /> <texture name="TabTop_Left_Press" file_name="containers/TabTop_Left_Press.png" preload="false" />
<texture name="TabTop_Middle_Press" file_name="containers/TabTop_Middle_Press.png" preload="false" /> <texture name="TabTop_Middle_Press" file_name="containers/TabTop_Middle_Press.png" preload="false" />
<texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false" /> <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
<texture name="TabTop_Right_Press" file_name="containers/TabTop_Right_Press.png" preload="false" /> <texture name="TabTop_Right_Press" file_name="containers/TabTop_Right_Press.png" preload="false" />
<texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false" /> <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
<texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" /> <texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
<texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" /> <texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
<texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" /> <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
...@@ -574,7 +574,6 @@ with the same filename but different name ...@@ -574,7 +574,6 @@ with the same filename but different name
<texture name="TimeBasedMediaBackground" file_name="windows/TimeBasedMediaBackground.png" preload="false" /> <texture name="TimeBasedMediaBackground" file_name="windows/TimeBasedMediaBackground.png" preload="false" />
<texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" /> <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
<texture name="Toast_Background" file_name="windows/Toast_Background.png" preload="true" <texture name="Toast_Background" file_name="windows/Toast_Background.png" preload="true"
scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" /> scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
......
indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+ 19
− 26
View file @ 26d2a5fe
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Outfits" <panel name="Outfits"
background_visible="true" background_visible="true"
follows="all" follows="all"
...@@ -8,7 +7,7 @@ ...@@ -8,7 +7,7 @@
layout="topleft" layout="topleft"
min_height="350" min_height="350"
min_width="240" min_width="240"
width="330" width="320"
border="false"> border="false">
<tab_container <tab_container
follows="all" follows="all"
...@@ -16,24 +15,28 @@ ...@@ -16,24 +15,28 @@
layout="topleft" layout="topleft"
left="10" left="10"
name="appearance_tabs" name="appearance_tabs"
tab_min_width="100" tab_min_width="140"
tab_height="30" tab_height="30"
tab_position="top" tab_position="top"
halign="center" halign="center"
width="313"> width="313">
<inventory_panel <inventory_panel
follows="all"
background_visible="true"
background_opaque="true"
label="WEARING" label="WEARING"
help_topic="now_wearing_tab" help_topic="now_wearing_tab"
allow_multi_select="true" allow_multi_select="true"
border="false" border="false"
height="500"
width="290"
left="0" left="0"
top="0" top="0"
mouse_opaque="true" mouse_opaque="true"
name="cof_accordionpanel" name="cof_accordionpanel"
start_folder="Current Outfit" /> start_folder="Current Outfit"
width="313" />
<inventory_panel <inventory_panel
background_visible="true"
background_opaque="true"
label="MY OUTFITS" label="MY OUTFITS"
help_topic="my_outfits_tab" help_topic="my_outfits_tab"
allow_multi_select="true" allow_multi_select="true"
...@@ -41,11 +44,10 @@ ...@@ -41,11 +44,10 @@
border="false" border="false"
left="0" left="0"
top="0" top="0"
height="500" width="314"
width="290"
mouse_opaque="true" mouse_opaque="true"
name="outfitslist_accordionpanel" name="outfitslist_accordionpanel"
start_folder="My Outfits" /> start_folder="My Outfits" />
</tab_container> </tab_container>
<panel <panel
background_visible="true" background_visible="true"
...@@ -80,35 +82,26 @@ ...@@ -80,35 +82,26 @@
tool_tip="Remove selected item" tool_tip="Remove selected item"
top="6" top="6"
width="18" /> width="18" />
<button
follows="bottom|left"
height="23"
label="Edit Look"
layout="topleft"
left="10"
name="look_edit_btn"
top="26"
visible="false"
width="90" />
<button <button
follows="bottom|left" follows="bottom|left"
height="23" height="23"
label="Make Outfit" label="Make Outfit"
layout="topleft" layout="topleft"
name="make_outfit_btn" name="make_outfit_btn"
tool_tip="Save appearance as an outfit" tool_tip="Save appearance as an outfit"
top="26" top="26"
right="-110" left='10'
width="90" /> width="120" />
<button <button
follows="bottom|right" follows="bottom|right"
height="23" height="23"
label="Wear" label="Wear"
layout="topleft" layout="topleft"
name="wear_btn" name="wear_btn"
right="-10" right="-10"
left_pad="10"
top="26" top="26"
tool_tip="Wear selected outfit" tool_tip="Wear selected outfit"
width="90" /> width="120" />
</panel> </panel>
</panel> </panel>
indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+ 13
− 13
View file @ 26d2a5fe
...@@ -52,25 +52,26 @@ width="333"> ...@@ -52,25 +52,26 @@ width="333">
text_color="white" text_color="white"
top="3" top="3"
use_ellipses="true" use_ellipses="true"
width="290" width="305"
follows="top|left" follows="top|left"
word_wrap="true" word_wrap="true"
mouse_opaque="false" mouse_opaque="false"
name="currentlook_name"> name="currentlook_name">
MyOutfit With a really Long Name like MOOSE MyOutfit With a really Long Name like MOOSE
</text> </text>
<!-- <text <!--MERGING PERSON! TAKE THIS BIT BELOW FROM THE AVATAR BRANCH! TY -ERICA -->
text_color="LtGray_50" <!-- <text
width="290" font="SansSerifSmall"
left="40" text_color="White_50"
width="300"
height="1" height="1"
follows="top|left" follows="top|left"
layout="topleft" layout="topleft"
top_pad="-2" top_pad="5"
mouse_opaque="false" mouse_opaque="false"
name="currentlook_title" > name="currentlook_title" >
(current outfit) (current outfit) OR (unsaved)
</text>--> </text>-->
</panel> </panel>
<filter_editor <filter_editor
height="23" height="23"
...@@ -80,18 +81,18 @@ width="333"> ...@@ -80,18 +81,18 @@ width="333">
label="Filter Outfits" label="Filter Outfits"
max_length="300" max_length="300"
name="Filter" name="Filter"
top_pad="0" top_pad="10"
width="303" /> width="303" />
<panel <panel
class="panel_outfits_inventory" class="panel_outfits_inventory"
filename="panel_outfits_inventory.xml" filename="panel_outfits_inventory.xml"
name="panel_outfits_inventory" name="panel_outfits_inventory"
height="515" height="505"
min_height="410" min_height="410"
width="320" width="320"
left="0"
top_pad="0" top_pad="0"
follows="all" follows="all" />
/>
<!-- <button <!-- <button
follows="bottom|left" follows="bottom|left"
height="23" height="23"
...@@ -120,4 +121,3 @@ width="333"> ...@@ -120,4 +121,3 @@ width="333">
top="35" top="35"
visible="false" /> visible="false" />
</panel> </panel>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment