livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Vadim ProductEngine 2011-08-05 17:42:46 +03:00
parent c8d86e062c
commit 72e5b40e93
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterbuyland.cpp
View File

@ -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)

9
indra/newview/skins/default/xui/en/floater_buy_land.xml
View File

@ -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