From a10eb7b240675b009430f6718d410399d8045581 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 5 Nov 2013 19:30:38 -0800
Subject: further fix of inventory keyboard focus and tab order calculations

---
 indra/llui/llviewquery.cpp | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'indra/llui/llviewquery.cpp')

diff --git a/indra/llui/llviewquery.cpp b/indra/llui/llviewquery.cpp
index d0b78ba186..66262609ae 100755
--- a/indra/llui/llviewquery.cpp
+++ b/indra/llui/llviewquery.cpp
@@ -30,7 +30,7 @@
 #include "lluictrl.h"
 #include "llviewquery.h"
 
-void LLQuerySorter::operator() (LLView * parent, viewList_t &children) const {}
+void LLQuerySorter::sort(LLView * parent, viewList_t &children) const {}
 
 filterResult_t LLLeavesFilter::operator() (const LLView* const view, const viewList_t & children) const 
 {
@@ -89,8 +89,8 @@ viewList_t LLViewQuery::run(LLView* view) const
 		if (pre.first)
 		{
 			post = runFilters(view, filtered_children, mPostFilters);
-			}
 		}
+	}
 
 	if(pre.first && post.first) 
 	{
@@ -105,12 +105,12 @@ viewList_t LLViewQuery::run(LLView* view) const
 	return result;
 }
 
-void LLViewQuery::filterChildren(LLView * view, viewList_t & filtered_children) const
+void LLViewQuery::filterChildren(LLView* parent_view, viewList_t & filtered_children) const
 {
-	LLView::child_list_t views(*(view->getChildList()));
+	LLView::child_list_t views(*(parent_view->getChildList()));
 	if (mSorterp)
 	{
-		(*mSorterp)(view, views); // sort the children per the sorter
+		mSorterp->sort(parent_view, views); // sort the children per the sorter
 	}
 	for(LLView::child_list_iter_t iter = views.begin();
 		iter != views.end();
@@ -134,18 +134,3 @@ filterResult_t LLViewQuery::runFilters(LLView * view, const viewList_t children,
 	}
 	return result;
 }
-
-class SortByTabOrder : public LLQuerySorter, public LLSingleton<SortByTabOrder>
-{
-	/*virtual*/ void operator() (LLView * parent, LLView::child_list_t &children) const 
-	{
-		children.sort(LLCompareByTabOrder(parent->getCtrlOrder()));
-	}
-};
-
-LLCtrlQuery::LLCtrlQuery() : 
-	LLViewQuery()
-{
-	setSorter(SortByTabOrder::getInstance());
-}
-
-- 
cgit v1.2.3