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

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience

master
Richard Linden 2012-01-27 19:55:42 -08:00
parent 84b7ff7915 22a6170a7b
commit 3249a1ced0
8 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llfontgl.cpp
View File

@ -219,10 +219,10 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
switch (valign)
{
case TOP:
cur_y -= mFontFreetype->getAscenderHeight();
cur_y -= llceil(mFontFreetype->getAscenderHeight());
break;
case BOTTOM:
cur_y += mFontFreetype->getDescenderHeight();
cur_y += llceil(mFontFreetype->getDescenderHeight());
break;
case VCENTER:
cur_y -= (mFontFreetype->getAscenderHeight() - mFontFreetype->getDescenderHeight()) / 2.f;

4
indra/llui/llbutton.cpp
View File

@ -908,9 +908,9 @@ void LLButton::draw()
// Not sure if it is really needed. Probably S32_MAX should be always passed as max_chars.
mLastDrawCharsCount = mGLFont->render(label, 0,
(F32)x,
(F32)(mBottomVPad + y_offset),
(F32)(getRect().getHeight() / 2 + mBottomVPad),
label_color % alpha,
mHAlign, LLFontGL::BOTTOM,
mHAlign, LLFontGL::VCENTER,
LLFontGL::NORMAL,
mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NO_SHADOW,
S32_MAX, text_width,

4
indra/llui/lltextbase.cpp
View File

@ -2395,8 +2395,8 @@ void LLTextBase::updateRects()
}
mTextBoundingRect.mTop += mVPad;
// subtract a pixel off the bottom to deal with rounding errors in measuring font height
mTextBoundingRect.mBottom -= 1;
//// subtract a pixel off the bottom to deal with rounding errors in measuring font height
//mTextBoundingRect.mBottom -= 1;
S32 delta_pos = -mTextBoundingRect.mBottom;
// move line segments to fit new document rect

4
indra/newview/lltoast.cpp
View File

@ -296,9 +296,7 @@ void LLToast::reshapeToPanel()
if(!panel)
return;
LLRect panel_rect = panel->getRect();
panel_rect.setLeftTopAndSize(0, panel_rect.getHeight(), panel_rect.getWidth(), panel_rect.getHeight());
LLRect panel_rect = panel->getLocalRect();
panel->setShape(panel_rect);
LLRect toast_rect = getRect();

1
indra/newview/skins/default/xui/en/floater_fast_timers.xml
View File

@ -22,7 +22,6 @@
top="5"
width="180"
height="40"
pad_bottom="-5"
label="Pause"
font="SansSerifHuge"/>
</floater>

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

@ -67,7 +67,6 @@
label_shadow="true"
name="buyL"
pad_right="0"
pad_bottom="2"
tool_tip="Click to buy more L$"
top="0"
width="80" />
@ -87,7 +86,6 @@
left_pad="0"
label_shadow="true"
name="goShop"
pad_bottom="2"
tool_tip="Open Second Life Marketplace"
top="0"
width="65" />

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

@ -21,7 +21,7 @@
font="SansSerifSmall"
hover_glow_amount="0.15"
halign="center"
pad_bottom="2"
pad_bottom="1"
height="23"
scale_image="true"
handle_right_mouse="true"

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

@ -11,7 +11,7 @@ label_pad_left - padding to the left of tab button labels
halign="center"
font="SansSerifSmall"
tab_height="21"
label_pad_bottom="2"
label_pad_bottom="0"
label_pad_left="4">
<!--
Possible additional attributes for tabs: