1 files changed, 104 insertions, 71 deletions

diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index d65ebd2..36a7b00 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -518,6 +518,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
         mNeedsScroll(FALSE),
         mCanSelect(TRUE),
         mDisplayColumnHeaders(FALSE),
+        mColumnsDirty(FALSE),
         mMaxItemCount(INT_MAX), 
         mMaxContentWidth(0),
         mBackgroundVisible( TRUE ),
@@ -630,7 +631,6 @@ void LLScrollListCtrl::clearRows()
 
         mScrollLines = 0;
         mLastSelected = NULL;
-        calcMaxContentWidth(NULL);
         updateLayout();
         mDirty = FALSE; 
 }
@@ -762,7 +762,7 @@ void LLScrollListCtrl::updateLayout()
         mScrollbar->setDocSize( getItemCount() );
         mScrollbar->setVisible(scrollbar_visible);
 
-        updateColumns();
+        dirtyColumns();
 }
 
 // Attempt to size the control to show all items.
@@ -840,7 +840,6 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
                 }
 
                 updateLineHeightInsert(item);
-                calcMaxContentWidth(item);
 
                 updateLayout();
         }
@@ -848,17 +847,14 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
         return not_too_big;
 }
 
-void LLScrollListCtrl::calcMaxContentWidth(LLScrollListItem* added_item)
+void LLScrollListCtrl::calcColumnWidths()
 {
         const S32 HEADING_TEXT_PADDING = 30;
         const S32 COLUMN_TEXT_PADDING = 20;
 
-        if (added_item == NULL)
-        {
-                mMaxContentWidth = 0;
-        }
+        mMaxContentWidth = 0;
 
-        S32 item_content_width = 0;
+        S32 max_item_width = 0;
 
         ordered_columns_t::iterator column_itor;
         for (column_itor = mColumnsIndexed.begin(); column_itor != mColumnsIndexed.end(); ++column_itor)
@@ -866,31 +862,37 @@ void LLScrollListCtrl::calcMaxContentWidth(LLScrollListItem* added_item)
                 LLScrollListColumn* column = *column_itor;
                 if (!column) continue;
 
-                if (!added_item)
+                // update column width
+                S32 new_width = column->mWidth;
+                if (column->mRelWidth >= 0)
                 {
-                        // update on all items
-                        column->mMaxContentWidth = column->mHeader ? LLFontGL::sSansSerifSmall->getWidth(column->mLabel) + mColumnPadding + HEADING_TEXT_PADDING : 0;
-                        item_list::iterator iter;
-                        for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
-                        {
-                                LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex);
-                                if (!cellp) continue;
+                        new_width = (S32)llround(column->mRelWidth*mItemListRect.getWidth());
+                }
+                else if (column->mDynamicWidth)
+                {
+                        new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
+                }
 
-                                column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
-                        }
+                if (new_width != column->mWidth)
+                {
+                        column->mWidth = new_width;
                 }
-                else
+
+                // update max content width for this column, by looking at all items
+                column->mMaxContentWidth = column->mHeader ? LLFontGL::sSansSerifSmall->getWidth(column->mLabel) + mColumnPadding + HEADING_TEXT_PADDING : 0;
+                item_list::iterator iter;
+                for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
                 {
-                        LLScrollListCell* cellp = added_item->getColumn(column->mIndex);
+                        LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex);
                         if (!cellp) continue;
 
                         column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
                 }
 
-                item_content_width += column->mMaxContentWidth;
+                max_item_width += column->mMaxContentWidth;
         }
 
-        mMaxContentWidth = llmax(mMaxContentWidth, item_content_width);
+        mMaxContentWidth = max_item_width;
 }
 
 const S32 SCROLL_LIST_ROW_PAD = 2;
@@ -926,29 +928,9 @@ void LLScrollListCtrl::updateLineHeightInsert(LLScrollListItem* itemp)
 
 void LLScrollListCtrl::updateColumns()
 {
-        mColumnsIndexed.resize(mColumns.size());
-
-        std::map<LLString, LLScrollListColumn>::iterator column_itor;
-        for (column_itor = mColumns.begin(); column_itor != mColumns.end(); ++column_itor)
-        {
-                LLScrollListColumn *column = &column_itor->second;
-                S32 new_width = column->mWidth;
-                if (column->mRelWidth >= 0)
-                {
-                        new_width = (S32)llround(column->mRelWidth*mItemListRect.getWidth());
-                }
-                else if (column->mDynamicWidth)
-                {
-                        new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
-                }
-
-                if (new_width != column->mWidth)
-                {
-                        column->mWidth = new_width;
-                }
-                mColumnsIndexed[column_itor->second.mIndex] = column;
-        }
+        calcColumnWidths();
 
+        // propagate column widths to individual cells
         item_list::iterator iter;
         for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
         {
@@ -963,7 +945,7 @@ void LLScrollListCtrl::updateColumns()
                 }
         }
 
-        // update headers
+        // update column headers
         std::vector<LLScrollListColumn*>::iterator column_ordered_it;
         S32 left = mItemListRect.mLeft;
         LLColumnHeader* last_header = NULL;
@@ -998,6 +980,7 @@ void LLScrollListCtrl::updateColumns()
                 }
         }
 
+        //FIXME: stretch the entire last column if it is resizable (gestures windows shows truncated text in last column)
         // expand last column header we encountered to full list width
         if (last_header)
         {
@@ -1055,28 +1038,42 @@ BOOL LLScrollListCtrl::selectFirstItem()
         return success;
 }
 
-
+// Deselects all other items
+// virtual
 BOOL LLScrollListCtrl::selectNthItem( S32 target_index )
 {
-        if (mItemList.empty()) return FALSE;
+        return selectItemRange(target_index, target_index);
+}
 
-        // Deselects all other items
-        BOOL success = FALSE;
-        S32 index = 0;
+// virtual
+BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
+{
+        if (mItemList.empty())
+        {
+                return FALSE;
+        }
 
-        target_index = llclamp(target_index, 0, (S32)mItemList.size() - 1);
+        S32 listlen = (S32)mItemList.size();
+        first_index = llclamp(first_index, 0, listlen-1);
+        
+        if (last_index < 0)
+                last_index = listlen-1;
+        else
+                last_index = llclamp(last_index, first_index, listlen-1);
 
-        item_list::iterator iter;
-        for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
+        BOOL success = FALSE;
+        S32 index = 0;
+        for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); iter++)
         {
                 LLScrollListItem *itemp = *iter;
-                if( target_index == index )
+                if( index >= first_index && index <= last_index )
                 {
                         if( itemp->getEnabled() )
                         {
                                 selectItem(itemp);
                                 success = TRUE;
-                                mOriginalSelection = target_index;
+                                if (!success)
+                                        mOriginalSelection = first_index;
                         }
                 }
                 else
@@ -1125,7 +1122,7 @@ void LLScrollListCtrl::swapWithPrevious(S32 index)
 
 void LLScrollListCtrl::deleteSingleItem(S32 target_index)
 {
-        if (target_index >= (S32)mItemList.size())
+        if (target_index < 0 || target_index >= (S32)mItemList.size())
         {
                 return;
         }
@@ -1138,7 +1135,7 @@ void LLScrollListCtrl::deleteSingleItem(S32 target_index)
         }
         delete itemp;
         mItemList.erase(mItemList.begin() + target_index);
-        calcMaxContentWidth(NULL);
+        dirtyColumns();
 }
 
 //FIXME: refactor item deletion
@@ -1163,7 +1160,7 @@ void LLScrollListCtrl::deleteItems(const LLSD& sd)
                 }
         }
 
-        calcMaxContentWidth(NULL);
+        dirtyColumns();
 }
 
 void LLScrollListCtrl::deleteSelectedItems()
@@ -1183,7 +1180,7 @@ void LLScrollListCtrl::deleteSelectedItems()
                 }
         }
         mLastSelected = NULL;
-        calcMaxContentWidth(NULL);
+        dirtyColumns();
 }
 
 void LLScrollListCtrl::highlightNthItem(S32 target_index)
@@ -1237,7 +1234,7 @@ S32 LLScrollListCtrl::getItemIndex( LLScrollListItem* target_item )
         return -1;
 }
 
-S32 LLScrollListCtrl::getItemIndex( LLUUID& target_id )
+S32 LLScrollListCtrl::getItemIndex( const LLUUID& target_id )
 {
         S32 index = 0;
         item_list::iterator iter;
@@ -1722,6 +1719,12 @@ void LLScrollListCtrl::draw()
                         gl_rect_2d(background);
                 }
 
+                if (mColumnsDirty)
+                {
+                        updateColumns();
+                        mColumnsDirty = FALSE;
+                }
+
                 drawItems();
 
                 if (mBorder)
@@ -1989,9 +1992,8 @@ BOOL LLScrollListCtrl::handleClick(S32 x, S32 y, MASK mask)
                         gFocusMgr.setMouseCapture(this);
                         mNeedsScroll = TRUE;
                 }
-                // otherwise we already have this item selected
-                // so propagate state of cell to rest of selected column
-                else
+                
+                // propagate state of cell to rest of selected column
                 {
                         // propagate value of this cell to other selected items
                         // and commit the respective widgets
@@ -2537,6 +2539,23 @@ void LLScrollListCtrl::sortItems()
         setSorted(TRUE);
 }
 
+void LLScrollListCtrl::dirtyColumns() 
+{ 
+        mColumnsDirty = TRUE; 
+
+        // need to keep mColumnsIndexed up to date
+        // just in case someone indexes into it immediately
+        mColumnsIndexed.resize(mColumns.size());
+
+        std::map<LLString, LLScrollListColumn>::iterator column_itor;
+        for (column_itor = mColumns.begin(); column_itor != mColumns.end(); ++column_itor)
+        {
+                LLScrollListColumn *column = &column_itor->second;
+                mColumnsIndexed[column_itor->second.mIndex] = column;
+        }
+}
+
+
 S32 LLScrollListCtrl::getScrollPos()
 {
         return mScrollbar->getDocPos();
@@ -2727,6 +2746,12 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
         S32 search_column = 0;
         node->getAttributeS32("search_column", search_column);
 
+        S32 sort_column = -1;
+        node->getAttributeS32("sort_column", sort_column);
+
+        BOOL sort_ascending = TRUE;
+        node->getAttributeBOOL("sort_ascending", sort_ascending);
+
         LLUICtrlCallback callback = NULL;
 
         LLScrollListCtrl* scroll_list = new LLScrollListCtrl(
@@ -2751,6 +2776,11 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 
         scroll_list->setSearchColumn(search_column);
 
+        if (sort_column >= 0)
+        {
+                scroll_list->sortByColumn(sort_column, sort_ascending);
+        }
+
         LLSD columns;
         S32 index = 0;
         LLXMLNodePtr child;
@@ -3026,7 +3056,7 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
                 }
         }
 
-        updateColumns();
+        dirtyColumns();
 }
 
 // static
@@ -3257,13 +3287,14 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 col_index++;
         }
 
-        S32 num_columns = mColumns.size();
-        for (S32 column = 0; column < num_columns; ++column)
+        // add dummy cells for missing columns
+        for (column_map_t::iterator column_it = mColumns.begin(); column_it != mColumns.end(); ++column_it)
         {
-                if (new_item->getColumn(column) == NULL)
+                S32 column_idx = column_it->second.mIndex;
+                if (new_item->getColumn(column_idx) == NULL)
                 {
-                        LLScrollListColumn* column_ptr = mColumnsIndexed[column];
-                        new_item->setColumn(column, new LLScrollListText("", gResMgr->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
+                        LLScrollListColumn* column_ptr = &column_it->second;
+                        new_item->setColumn(column_idx, new LLScrollListText("", gResMgr->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
                 }
         }
 
@@ -3665,7 +3696,7 @@ LLView*	LLColumnHeader::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_d
 void LLColumnHeader::userSetShape(const LLRect& new_rect)
 {
         S32 new_width = new_rect.getWidth();
-        S32 delta_width = new_width - (mRect.getWidth() + mColumn->mParentCtrl->getColumnPadding());
+        S32 delta_width = new_width - (mRect.getWidth() /*+ mColumn->mParentCtrl->getColumnPadding()*/);
 
         if (delta_width != 0)
         {
@@ -3737,6 +3768,8 @@ void LLColumnHeader::userSetShape(const LLRect& new_rect)
                 }
 
                 // tell scroll list to layout columns again
+                // do immediate update to get proper feedback to resize handle
+                // which needs to know how far the resize actually went
                 mColumn->mParentCtrl->updateColumns();
         }
 }