From 8f40c559f37ec33886e34c42dc076d4bb28ab609 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 19 Mar 2010 17:03:17 +0200
Subject: Update for critical bug EXT-6318 [TRUNCATION] [EN XUI REWORK] - Talk
 button is truncated "Sprechen". need xui designer to widen it by some 10
 pixels * restored center aligning for Speak button's label. * also it is
 right aligned in 'de' locale which has too long value. * default right
 padding is set in 'en' locale (in has no effect on center aligned label)

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/36/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/de/panel_bottomtray.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
index d3f89b0ad3..d52b8dcf4d 100644
--- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
@@ -9,7 +9,7 @@
 	<layout_stack name="toolbar_stack">
 		<layout_panel name="speak_panel">
 			<talk_button name="talk">
-				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/>
+				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn" halign="right" />
 			</talk_button>
 		</layout_panel>
 		<layout_panel name="gesture_panel">
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index e70a0512d6..58c5c11e51 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -74,12 +74,15 @@
            name="talk"
            top="5"
           width="105">
+            <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
+             & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
   <speak_button
-    halign="left"
+    halign="center"
     name="speak_btn"
     label="Speak"
     label_selected="Speak"
-    pad_left="12"
+    pad_right="22"
+    use_ellipses="true"
     />
               <show_button>
                   <show_button.init_callback
-- 
cgit v1.2.3