From dc6216e77e84369450d3a9e2269bf4d03436a23d Mon Sep 17 00:00:00 2001 From: "Justin C. Rounds (Chuck)" Date: Mon, 23 Nov 2009 13:56:01 -0500 Subject: "Fit and finish" issues with bottom bar. See comments in JIRAs for details. http://jira.secondlife.com/browse/EXT-2537 http://jira.secondlife.com/browse/EXT-2352 --- .../default/textures/bottomtray/Notices_Unread.png | Bin 333 -> 331 bytes indra/newview/skins/default/textures/textures.xml | 11 ++++- .../default/textures/widgets/Arrow_Small_Left.png | Bin 0 -> 223 bytes .../default/textures/widgets/Arrow_Small_Right.png | Bin 0 -> 217 bytes .../default/textures/widgets/Arrow_Small_Up.png | Bin 0 -> 382 bytes .../widgets/ComboButton_Up_On_Selected.png | Bin 0 -> 482 bytes .../skins/default/xui/en/panel_bottomtray.xml | 53 ++++++++++++++------- .../skins/default/xui/en/panel_nearby_chat_bar.xml | 12 +++-- .../default/xui/en/widgets/gesture_combo_box.xml | 4 +- .../skins/default/xui/en/widgets/talk_button.xml | 11 ++++- 10 files changed, 64 insertions(+), 27 deletions(-) create mode 100644 indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png create mode 100644 indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png create mode 100644 indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png index 98f1f04b9a..aa3898ca99 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png and b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f4a239be62..8469cf9e2d 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -50,8 +50,12 @@ with the same filename but different name - - + + + + + + @@ -120,6 +124,7 @@ with the same filename but different name + @@ -439,6 +444,7 @@ with the same filename but different name + @@ -453,6 +459,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png new file mode 100644 index 0000000000..2d624c3779 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png differ diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png new file mode 100644 index 0000000000..91c03c426e Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png differ diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png new file mode 100644 index 0000000000..38aac0e5ca Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png differ diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png new file mode 100644 index 0000000000..fd1d11dd0b Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png differ diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 00711a29e0..a8e659259e 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -46,7 +46,7 @@ left="0" min_height="23" width="310" - top="0" + top="4" min_width="192" name="chat_bar" user_resize="false" @@ -58,9 +58,9 @@ height="28" layout="topleft" min_height="28" - width="104" + width="100" top_delta="0" - min_width="104" + min_width="100" name="speak_panel" user_resize="false">