From 9ebd99d8ae5f1939a1fe48349820c7c6ed6c06a4 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Mon, 15 Feb 2010 20:57:34 +0200 Subject: Fixed low bug (EXT-5251) Status text isn't aligned to top in inventory SP - Changed status textbox rect in folder view. --HG-- branch : product-engine --- indra/newview/llfolderview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 8dbdfff635..3230402bdc 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -234,7 +234,7 @@ LLFolderView::LLFolderView(const Params& p) // Textbox LLTextBox::Params text_p; - LLRect new_r(5, 13-50, 300, 0-50); + LLRect new_r(5, 40, 300, 40-13); text_p.name(std::string(p.name)); text_p.rect(new_r); text_p.font(getLabelFontForStyle(mLabelStyle)); -- cgit v1.2.3 From ef21d64c84a7dd1382ac0da1f14c7707351373fa Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Mon, 15 Feb 2010 22:07:38 +0200 Subject: Fixed normal bug EXT-5328 (Focus is lost after LEFT arrow button has been pressed in Landmarks tab) --HG-- branch : product-engine --- indra/newview/llfolderview.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 3230402bdc..d053933dfb 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1625,7 +1625,11 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask ) LLFolderViewItem* parent_folder = last_selected->getParentFolder(); if (!last_selected->isOpen() && parent_folder && parent_folder->getParentFolder()) { - setSelection(parent_folder, FALSE, TRUE); + // Don't change selectin to hidden folder. See EXT-5328. + if (!parent_folder->getHidden()) + { + setSelection(parent_folder, FALSE, TRUE); + } } else { -- cgit v1.2.3 From cef352006cf46ceef8d0e2565d9adf44d9e093f1 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Tue, 16 Feb 2010 17:32:29 +0200 Subject: (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(-) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index d053933dfb..888ddbcbc7 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 (text_p); + mStatusTextBox->setFollowsLeft(); + mStatusTextBox->setFollowsTop(); //addChild(mStatusTextBox); -- cgit v1.2.3 From eefdbced383333b75fbe6b2f338c6db74f68d018 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 16 Feb 2010 16:41:16 +0000 Subject: fix implicit cast in 2ea5dc26d479 / EXT-5251 --- indra/newview/llfolderview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 888ddbcbc7..68faaeaa0b 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -236,9 +236,9 @@ LLFolderView::LLFolderView(const Params& p) LLTextBox::Params text_p; LLFontGL* font = getLabelFontForStyle(mLabelStyle); LLRect new_r = LLRect(rect.mLeft + ICON_PAD, - rect.mTop - TEXT_PAD, - rect.mRight, - rect.mTop - TEXT_PAD - font->getLineHeight()); + rect.mTop - TEXT_PAD, + rect.mRight, + rect.mTop - TEXT_PAD - llfloor(font->getLineHeight())); text_p.rect(new_r); text_p.name(std::string(p.name)); text_p.font(font); -- cgit v1.2.3