summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-05-03 17:03:37 -0700
committerMerov Linden <merov@lindenlab.com>2013-05-03 17:03:37 -0700
commitad12517329e73abf64ccc926aa49453cb4b73bfc (patch)
tree3466824069c8b4a9e8c2614a5aa3129dce122c33 /indra/llui
parent701facaac4bd4dde76427fac014da6d1e1641c2a (diff)
ACME-275 : WIP : Filtering
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llfolderview.cpp5
-rwxr-xr-xindra/llui/llfolderviewitem.cpp16
2 files changed, 20 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index cf449217f5..679a76e26f 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1652,6 +1652,11 @@ void LLFolderView::update()
}
BOOL is_visible = isInVisibleChain();
+
+ if (getName() == "Persons")
+ {
+ llinfos << "Merov : update Persons, is_visible = " << is_visible << llendl;
+ }
// Puts folders/items in proper positions
// arrange() takes the model filter flag into account and call sort() if necessary (CHUI-849)
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 6c147ccc12..88bc0ccfd4 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -953,6 +953,12 @@ static LLFastTimer::DeclareTimer FTM_ARRANGE("Arrange");
// * Makes sure that this view and its children are the right size
S32 LLFolderViewFolder::arrange( S32* width, S32* height )
{
+ llinfos << "Merov : LLFolderViewFolder::arrange, folder = " << getName() << llendl;
+ if (getName() == "Facebook Friends Tab Two")
+ {
+ llinfos << "Merov : Arranging Facebook Friends Tab Two, needs arrange = " << needsArrange() << ", is open = " << isOpen() << llendl;
+ }
+
// Sort before laying out contents
// Note that we sort from the root (CHUI-849)
getRoot()->getFolderViewModel()->sort(this);
@@ -1109,7 +1115,11 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
BOOL LLFolderViewFolder::needsArrange()
{
- return mLastArrangeGeneration < getRoot()->getArrangeGeneration();
+ if (getName() != "")
+ {
+ llinfos << "Merov : needsArrange for " << getName() << ", last = " << mLastArrangeGeneration << ", current = " << getRoot()->getArrangeGeneration() << ", need = " << (mLastArrangeGeneration < getRoot()->getArrangeGeneration() ? "true" : "false") << llendl;
+ }
+ return mLastArrangeGeneration != getRoot()->getArrangeGeneration();
}
// Passes selection information on to children and record selection
@@ -1631,6 +1641,10 @@ void LLFolderViewFolder::requestArrange()
void LLFolderViewFolder::toggleOpen()
{
+ if (getName() == "Facebook Friends Tab Two")
+ {
+ llinfos << "Merov : toggleOpen, currently open is = " << isOpen() << llendl;
+ }
setOpen(!isOpen());
}