From cef352006cf46ceef8d0e2565d9adf44d9e093f1 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Tue, 16 Feb 2010 17:32:29 +0200
Subject: [PATCH] (EXT-5251) Status text isn't aligned to top in inventory SP.
- Removed some magic numbers in status textbox positioning.
--HG--
branch : product-engine
---
indra/newview/llfolderview.cpp | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index d053933dfba..888ddbcbc7b 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -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);
--
GitLab