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

STORM-1309 WIP Fixed maturity rating icon overlapping the floater right border. 

The code that places it now takes into account possible text truncation.
meow-7.2.2
Vadim ProductEngine 2011-08-05 17:45:32 +03:00
parent 72e5b40e93
commit 661601a99a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterbuyland.cpp
View File

@ -508,7 +508,9 @@ void LLFloaterBuyLandUI::updateCovenantInfo()
LLIconCtrl* rating_icon = getChild<LLIconCtrl>("rating_icon");
LLRect rect = rating_icon->getRect();
S32 icon_left_pad = region_name->getRect().mLeft + region_name->getTextBoundingRect().getWidth() + ICON_PAD;
S32 region_name_width = llmin(region_name->getRect().getWidth(), region_name->getTextBoundingRect().getWidth());
S32 icon_left_pad = region_name->getRect().mLeft + region_name_width + ICON_PAD;
region_name->setToolTip(region_name->getText());
rating_icon->setRect(rect.setOriginAndSize(icon_left_pad, rect.mBottom, rect.getWidth(), rect.getHeight()));
switch(sim_access)

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

@ -208,7 +208,7 @@ supports [AMOUNT2] objects
name="region_name_text"
top_delta="0"
use_ellipses="true"
width="155">
width="150">
(unknown)
</text>
<icon