1 files changed, 83 insertions, 44 deletions

diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 8de3a8a96f..d4c3cfb7b6 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -39,8 +39,8 @@
 
 static const LLDefaultChildRegistry::Register<LLFlatListView> flat_list_view("flat_list_view");
 
-const LLSD SELECTED_EVENT	= LLSD().insert("selected", true);
-const LLSD UNSELECTED_EVENT	= LLSD().insert("selected", false);
+const LLSD SELECTED_EVENT	= LLSD().with("selected", true);
+const LLSD UNSELECTED_EVENT	= LLSD().with("selected", false);
 
 static const std::string COMMENT_TEXTBOX = "comment_text";
 
@@ -484,6 +484,8 @@ void LLFlatListView::rearrangeItems()
 void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
 {
 	if (!item_pair) return;
+
+	setFocus(TRUE);
 	
 	bool select_item = !isSelected(item_pair);
 
@@ -528,7 +530,7 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
 			if ( !selectNextItemPair(true, reset_selection) && reset_selection)
 			{
 				// If case we are in accordion tab notify parent to go to the previous accordion
-				notifyParent(LLSD().insert("action","select_prev"));
+				notifyParent(LLSD().with("action","select_prev"));
 			}
 			break;
 		}
@@ -537,7 +539,7 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
 			if ( !selectNextItemPair(false, reset_selection) && reset_selection)
 			{
 				// If case we are in accordion tab notify parent to go to the next accordion
-				notifyParent(LLSD().insert("action","select_next"));
+				notifyParent(LLSD().with("action","select_next"));
 			}
 			break;
 		}
@@ -554,12 +556,21 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
 			break;
 	}
 
-	if ( key == KEY_UP || key == KEY_DOWN )
+	if ( ( key == KEY_UP || key == KEY_DOWN ) && mSelectedItemPairs.size() )
 	{
-		LLRect selcted_rect = getLastSelectedItemRect().stretch(1);
-		LLRect visible_rect = getVisibleContentRect();
-		if ( !visible_rect.contains (selcted_rect) )
-			scrollToShowRect(selcted_rect);
+		LLRect visible_rc = getVisibleContentRect();
+		LLRect selected_rc = getLastSelectedItemRect();
+
+		if ( !visible_rc.contains (selected_rc) )
+		{
+			// But scroll in Items panel coordinates
+			scrollToShowRect(selected_rc);
+		}
+
+		// In case we are in accordion tab notify parent to show selected rectangle
+		LLRect screen_rc;
+		localRectToScreen(selected_rc, &screen_rc);
+		notifyParent(LLSD().with("scrollToShowRect",screen_rc.getValue()));
 		handled = TRUE;
 	}
 
@@ -645,8 +656,6 @@ bool LLFlatListView::selectItemPair(item_pair_t* item_pair, bool select)
 		onCommit();
 	}
 
-	setFocus(TRUE);
-
 	// Stretch selected items rect to ensure it won't be clipped
 	mSelectedItemsBorder->setRect(getSelectedItemsRect().stretch(-1));
 
@@ -680,6 +689,17 @@ LLRect LLFlatListView::getSelectedItemsRect()
 	return rc;
 }
 
+void LLFlatListView::selectFirstItem	()
+{
+	selectItemPair(mItemPairs.front(), true);
+}
+
+void LLFlatListView::selectLastItem		()
+{
+	selectItemPair(mItemPairs.back(), true);
+}
+
+
 // virtual
 bool LLFlatListView::selectNextItemPair(bool is_up_direction, bool reset_selection)
 {
@@ -687,53 +707,53 @@ bool LLFlatListView::selectNextItemPair(bool is_up_direction, bool reset_selecti
 	if ( !mItemPairs.size() )
 		return false;
 
-	item_pair_t* cur_sel_pair = NULL;
+	
 	item_pair_t* to_sel_pair = NULL;
-
+	item_pair_t* cur_sel_pair = NULL;
 	if ( mSelectedItemPairs.size() )
 	{
 		// Take the last selected pair
 		cur_sel_pair = mSelectedItemPairs.back();
-	}
-	else
-	{
-		// If there weren't selected items then choose the first one bases on given direction
-		cur_sel_pair = (is_up_direction) ? mItemPairs.back() : mItemPairs.front();
-		// Force selection to first item
-		to_sel_pair = cur_sel_pair;
-	}
-
-	// Bases on given direction choose next item to select
-	if ( is_up_direction )
-	{
-		// Find current selected item position in mItemPairs list
-		pairs_list_t::reverse_iterator sel_it = std::find(mItemPairs.rbegin(), mItemPairs.rend(), cur_sel_pair);
-
-		for (;++sel_it != mItemPairs.rend();)
+		// Bases on given direction choose next item to select
+		if ( is_up_direction )
 		{
-			// skip invisible items
-			if ( (*sel_it)->first->getVisible() )
+			// Find current selected item position in mItemPairs list
+			pairs_list_t::reverse_iterator sel_it = std::find(mItemPairs.rbegin(), mItemPairs.rend(), cur_sel_pair);
+
+			for (;++sel_it != mItemPairs.rend();)
 			{
-				to_sel_pair = *sel_it;
-				break;
+				// skip invisible items
+				if ( (*sel_it)->first->getVisible() )
+				{
+					to_sel_pair = *sel_it;
+					break;
+				}
 			}
 		}
-	}
-	else
-	{
-		// Find current selected item position in mItemPairs list
-		pairs_list_t::iterator sel_it = std::find(mItemPairs.begin(), mItemPairs.end(), cur_sel_pair);
-
-		for (;++sel_it != mItemPairs.end();)
+		else
 		{
-			// skip invisible items
-			if ( (*sel_it)->first->getVisible() )
+			// Find current selected item position in mItemPairs list
+			pairs_list_t::iterator sel_it = std::find(mItemPairs.begin(), mItemPairs.end(), cur_sel_pair);
+
+			for (;++sel_it != mItemPairs.end();)
 			{
-				to_sel_pair = *sel_it;
-				break;
+				// skip invisible items
+				if ( (*sel_it)->first->getVisible() )
+				{
+					to_sel_pair = *sel_it;
+					break;
+				}
 			}
 		}
 	}
+	else
+	{
+		// If there weren't selected items then choose the first one bases on given direction
+		cur_sel_pair = (is_up_direction) ? mItemPairs.back() : mItemPairs.front();
+		// Force selection to first item
+		to_sel_pair = cur_sel_pair;
+	}
+
 
 	if ( to_sel_pair )
 	{
@@ -911,4 +931,23 @@ void LLFlatListView::onFocusLost()
 	mSelectedItemsBorder->setVisible(FALSE);
 }
 
+//virtual 
+void LLFlatListView::notify(const LLSD& info)
+{
+	if(info.has("action"))
+	{
+		std::string str_action = info["action"];
+		if(str_action == "select_first")
+		{
+			setFocus(true);
+			selectFirstItem();
+		}
+		else if(str_action == "select_last")
+		{
+			setFocus(true);
+			selectLastItem();
+		}
+	}
+}
+
 //EOF