From 5496531b9f8687dbdd2fd78a78b49ea20dd680df Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 27 Apr 2010 08:17:25 +0300
Subject: [PATCH] Fixed normal bug EXT-6581 ('Buy' floater looks corrupted
after size reducing)
-increased floater minimal width
-decreased width of TextBox with truncated string and used 'use_ellipses' for it
-deleted overriden button width dimension in DE locale
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/315/
--HG--
branch : product-engine
---
indra/newview/skins/default/xui/de/floater_buy_object.xml | 2 +-
indra/newview/skins/default/xui/en/floater_buy_object.xml | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/indra/newview/skins/default/xui/de/floater_buy_object.xml b/indra/newview/skins/default/xui/de/floater_buy_object.xml
index b23163b4a31..c697014b047 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_object.xml
@@ -6,7 +6,7 @@
<text name="buy_text">
[AMOUNT] L$ von [NAME] kaufen?
</text>
- <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73"/>
+ <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
<button label="Kaufen" label_selected="Kaufen" name="buy_btn"/>
<text name="title_buy_text">
Kaufen
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index f0e5e300109..3d8f5d678b0 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -5,7 +5,7 @@
height="290"
layout="topleft"
min_height="150"
- min_width="200"
+ min_width="225"
name="contents"
help_topic="contents"
save_rect="true"
@@ -52,7 +52,7 @@
<text
type="string"
length="1"
- follows="all"
+ follows="left|top|right"
font="SansSerif"
height="16"
layout="topleft"
@@ -90,7 +90,8 @@
name="buy_text"
text_color="white"
top_pad="5"
- width="276">
+ use_ellipses="true"
+ width="260">
Buy for L$[AMOUNT] from [NAME]?
</text>
<button
--
GitLab