EXP-1513 WIP Underscore ( _ ) fails to show in first chat entry in Local Chat

cleaned up font positioning on buttons
meow-7.2.2
Richard Linden 2012-01-27 17:48:08 -08:00
parent bbc265a9d5
commit cf02780ddf
6 changed files with 6 additions and 11 deletions

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,

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

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();

View File

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

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" />

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"