further fix of inventory keyboard focus and tab order calculations

1 files changed, 6 insertions, 28 deletions

diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 665aad70cf..7861c8f729 100755
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -200,12 +200,9 @@ public:
 	typedef child_list_t::reverse_iterator 			child_list_reverse_iter_t;
 	typedef child_list_t::const_reverse_iterator 	child_list_const_reverse_iter_t;
 
-	typedef std::vector<class LLUICtrl *>				ctrl_list_t;
-
-	typedef std::pair<S32, S32>							tab_order_t;
-	typedef std::pair<LLUICtrl *, tab_order_t>			tab_order_pair_t;
+	typedef std::pair<LLView *, S32>				tab_order_pair_t;
 	// this structure primarily sorts by the tab group, secondarily by the insertion ordinal (lastly by the value of the pointer)
-	typedef std::map<const LLUICtrl*, tab_order_t>		child_tab_order_t;
+	typedef std::map<const LLView*, S32>		child_tab_order_t;
 	typedef child_tab_order_t::iterator					child_tab_order_iter_t;
 	typedef child_tab_order_t::const_iterator			child_tab_order_const_iter_t;
 	typedef child_tab_order_t::reverse_iterator			child_tab_order_reverse_iter_t;
@@ -251,8 +248,6 @@ public:
 
 	void		sendChildToFront(LLView* child);
 	void		sendChildToBack(LLView* child);
-	void		moveChildToFrontOfTabGroup(LLUICtrl* child);
-	void		moveChildToBackOfTabGroup(LLUICtrl* child);
 	
 	virtual bool addChild(LLView* view, S32 tab_group = 0);
 
@@ -264,9 +259,7 @@ public:
 
 	virtual BOOL	postBuild() { return TRUE; }
 
-	const child_tab_order_t& getCtrlOrder() const		{ return mCtrlOrder; }
-	ctrl_list_t getCtrlList() const;
-	ctrl_list_t getCtrlListSorted() const;
+	const child_tab_order_t& getTabOrder() const		{ return mTabOrder; }
 	
 	void setDefaultTabGroup(S32 d)				{ mDefaultTabGroup = d; }
 	S32 getDefaultTabGroup() const				{ return mDefaultTabGroup; }
@@ -500,9 +493,9 @@ public:
 	static	BOOL focusPrev(LLView::child_list_t & result);
 
 	// returns query for iterating over controls in tab order	
-	static const LLCtrlQuery & getTabOrderQuery();
+	static const LLViewQuery & getTabOrderQuery();
 	// return query for iterating over focus roots in tab order
-	static const LLCtrlQuery & getFocusRootsQuery();
+	static const LLViewQuery & getFocusRootsQuery();
 
 	static LLWindow*	getWindow(void) { return LLUI::sWindow; }
 
@@ -596,7 +589,7 @@ private:
 	
 	U32			mReshapeFlags;
 
-	child_tab_order_t mCtrlOrder;
+	child_tab_order_t mTabOrder;
 	S32			mDefaultTabGroup;
 	S32			mLastTabGroup;
 
@@ -613,8 +606,6 @@ private:
 
 	BOOL		mLastVisible;
 
-	S32			mNextInsertionOrdinal;
-
 	bool		mInDraw;
 
 	static LLWindow* sWindow;	// All root views must know about their window.
@@ -686,19 +677,6 @@ struct TypeValues<LLView::EOrientation> : public LLInitParam::TypeValuesHelper<L
 };
 }
 
-
-class LLCompareByTabOrder
-{
-public:
-	LLCompareByTabOrder(const LLView::child_tab_order_t& order) : mTabOrder(order) {}
-	virtual ~LLCompareByTabOrder() {}
-	bool operator() (const LLView* const a, const LLView* const b) const;
-private:
-	virtual bool compareTabOrders(const LLView::tab_order_t & a, const LLView::tab_order_t & b) const { return a < b; }
-	// ok to store a reference, as this should only be allocated on stack during view query operations
-	const LLView::child_tab_order_t& mTabOrder;
-};
-
 template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) const
 {
 	LLView* child = findChildView(name, recurse);