diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-08-05 17:42:46 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-08-05 17:42:46 +0300 |
| commit | 72e5b40e93d5bee1e8b38bb3fa427823e970bea6 (patch) | |
| tree | aca16acf948df54e99fa7bd7830112fcdf4e0b06 | |
| parent | c8d86e062cbb1a10cb057c5080b9152793a45549 (diff) | |
STORM-1309 WIP Proper truncation of region type, estate name and estate owner text.
* Use ellipses for truncation.
* Where applicable, set tooltip to contain the uncut text.
* Leave a few pixels of padding between the text and the floater right border.
LLView::getChild<T>() never returns NULL, so no need to check its return value.
| -rw-r--r-- | indra/newview/llfloaterbuyland.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_buy_land.xml | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index 5cfdd69f7b..c643464825 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -530,6 +530,7 @@ void LLFloaterBuyLandUI::updateCovenantInfo() if (region_type) { region_type->setText(region->getLocalizedSimProductName()); + region_type->setToolTip(region->getLocalizedSimProductName()); } LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause"); @@ -619,7 +620,8 @@ void LLFloaterBuyLandUI::updateFloaterCovenantText(const std::string &string, co void LLFloaterBuyLandUI::updateFloaterEstateName(const std::string& name) { LLTextBox* box = getChild<LLTextBox>("estate_name_text"); - if (box) box->setText(name); + box->setText(name); + box->setToolTip(name); } void LLFloaterBuyLandUI::updateFloaterLastModified(const std::string& text) diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 78bb48109b..b8a87a2063 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -240,7 +240,8 @@ supports [AMOUNT2] objects left_delta="125" name="region_type_text" top_delta="0" - width="175"> + use_ellipses="true" + width="170"> (unknown) </text> <text @@ -265,7 +266,8 @@ supports [AMOUNT2] objects left_delta="125" name="estate_name_text" top_delta="0" - width="175"> + use_ellipses="true" + width="170"> (unknown) </text> <text @@ -290,7 +292,8 @@ supports [AMOUNT2] objects left_delta="125" name="estate_owner_text" top_delta="0" - width="175"> + use_ellipses="true" + width="170"> (unknown) </text> <text |