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

SL-10833 Restore missing code after a merge

meow-7.2.2
maxim_productengine 2019-05-02 13:45:40 +03:00
parent be0c609eaf
commit f67fe8fce7
1 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
indra/llui/lllineeditor.cpp
View File

@ -1690,39 +1690,44 @@ void LLLineEditor::doDelete()
}
void LLLineEditor::drawBackground()
{
bool has_focus = hasFocus();
LLUIImage* image;
if ( mReadOnly )
{
image = mBgImageDisabled;
}
else if ( has_focus || mShowImageFocused)
{
image = mBgImageFocused;
}
else
{
image = mBgImage;
}
if (!image) return;
F32 alpha = getCurrentTransparency();
// optionally draw programmatic border
if (has_focus)
{
LLColor4 tmp_color = gFocusMgr.getFocusColor();
tmp_color.setAlpha(alpha);
image->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(),
tmp_color,
gFocusMgr.getFocusFlashWidth());
}
LLColor4 tmp_color = UI_VERTEX_COLOR;
tmp_color.setAlpha(alpha);
image->draw(getLocalRect(), tmp_color);
void LLLineEditor::drawBackground()
{
F32 alpha = getCurrentTransparency();
if (mUseBgColor)
{
gl_rect_2d(getLocalRect(), mBgColor % alpha, TRUE);
}
else
{
bool has_focus = hasFocus();
LLUIImage* image;
if (mReadOnly)
{
image = mBgImageDisabled;
}
else if (has_focus || mShowImageFocused)
{
image = mBgImageFocused;
}
else
{
image = mBgImage;
}
if (!image) return;
// optionally draw programmatic border
if (has_focus)
{
LLColor4 tmp_color = gFocusMgr.getFocusColor();
tmp_color.setAlpha(alpha);
image->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(),
tmp_color,
gFocusMgr.getFocusFlashWidth());
}
LLColor4 tmp_color = UI_VERTEX_COLOR;
tmp_color.setAlpha(alpha);
image->draw(getLocalRect(), tmp_color);
}
}
void LLLineEditor::draw()