A function to set scroll list sort order
Renames getSortColumns to getSortOrder
This commit is contained in:
@@ -2425,6 +2425,12 @@ void LLScrollListCtrl::onScrollChange( S32 new_pos, LLScrollbar* scrollbar )
|
||||
}
|
||||
|
||||
|
||||
void LLScrollListCtrl::setSortOrder(const sort_order_t& order)
|
||||
{
|
||||
mSortColumns = order;
|
||||
updateSort();
|
||||
}
|
||||
|
||||
void LLScrollListCtrl::sortByColumn(const std::string& name, BOOL ascending)
|
||||
{
|
||||
column_map_t::iterator itor = mColumns.find(name);
|
||||
|
||||
@@ -325,10 +325,12 @@ public:
|
||||
S32 getTotalStaticColumnWidth() { return mTotalStaticColumnWidth; }
|
||||
|
||||
typedef std::pair<S32, bool> sort_column_t;
|
||||
const std::vector<sort_column_t>& getSortColumns() const { return mSortColumns; }
|
||||
typedef std::vector<sort_column_t> sort_order_t;
|
||||
const sort_order_t& getSortOrder() const { return mSortColumns; }
|
||||
std::string getSortColumnName();
|
||||
BOOL getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; }
|
||||
BOOL hasSortOrder() const;
|
||||
void setSortOrder(const sort_order_t& order);
|
||||
void clearSortOrder();
|
||||
void setSortEnabled(bool sort);
|
||||
|
||||
@@ -490,7 +492,7 @@ private:
|
||||
typedef std::vector<LLScrollListColumn*> ordered_columns_t;
|
||||
ordered_columns_t mColumnsIndexed;
|
||||
|
||||
std::vector<sort_column_t> mSortColumns;
|
||||
sort_order_t mSortColumns;
|
||||
|
||||
sort_signal_t* mSortCallback;
|
||||
}; // end class LLScrollListCtrl
|
||||
|
||||
@@ -258,7 +258,7 @@ LLFloaterAvatarList::~LLFloaterAvatarList()
|
||||
{
|
||||
mCleanup = true;
|
||||
LLSD sort;
|
||||
for (const auto& col : mAvatarList->getSortColumns())
|
||||
for (const auto& col : mAvatarList->getSortOrder())
|
||||
{
|
||||
sort.append(mAvatarList->getColumn(col.first)->mName);
|
||||
sort.append(col.second);
|
||||
|
||||
Reference in New Issue
Block a user