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

(EXT-5251) Status text isn't aligned to top in inventory SP. 

- Removed some magic numbers in status textbox positioning.

--HG--
branch : product-engine
master
Sergei Litovchuk 2010-02-16 17:32:29 +02:00
parent 07a5274e8c
commit cef352006c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfolderview.cpp
View File

@ -222,7 +222,7 @@ LLFolderView::LLFolderView(const Params& p)
// Escape is handled by reverting the rename, not commiting it (default behavior)
LLLineEditor::Params params;
params.name("ren");
params.rect(getRect());
params.rect(rect);
params.font(getLabelFontForStyle(LLFontGL::NORMAL));
params.max_length_bytes(DB_INV_ITEM_NAME_STR_LEN);
params.commit_callback.function(boost::bind(&LLFolderView::commitRename, this, _2));
@ -234,13 +234,19 @@ LLFolderView::LLFolderView(const Params& p)
// Textbox
LLTextBox::Params text_p;
LLRect new_r(5, 40, 300, 40-13);
text_p.name(std::string(p.name));
LLFontGL* font = getLabelFontForStyle(mLabelStyle);
LLRect new_r = LLRect(rect.mLeft + ICON_PAD,
rect.mTop - TEXT_PAD,
rect.mRight,
rect.mTop - TEXT_PAD - font->getLineHeight());
text_p.rect(new_r);
text_p.font(getLabelFontForStyle(mLabelStyle));
text_p.name(std::string(p.name));
text_p.font(font);
text_p.visible(false);
text_p.allow_html(true);
mStatusTextBox = LLUICtrlFactory::create<LLTextBox> (text_p);
mStatusTextBox->setFollowsLeft();
mStatusTextBox->setFollowsTop();
//addChild(mStatusTextBox);