Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue of columns not sorting in ascending order by default

Browse Source
This commit is contained in:
Lirusaito
2013-07-22 20:02:45 -04:00
parent c3b4ceff97
commit d64c9a343c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llui/llscrolllistctrl.cpp
View File

@@ -2616,9 +2616,17 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
if (child->getAttributeString("sort", sortname)) if (child->getAttributeString("sort", sortname))
columns[index]["sort"] = sortname; columns[index]["sort"] = sortname;
BOOL sort_ascending = true; std::string sort_direction("ascending");
if (child->getAttributeBOOL("sort_ascending", sort_ascending)) if (child->getAttributeString("sort_direction", sort_direction))
{
columns[index]["sort_direction"] = sort_direction;
}
else // Singu Note: if a scroll list does not provide sort_direction, provide sort_ascending to sort as expected
{
bool sort_ascending = true;
child->getAttribute_bool("sort_ascending", sort_ascending);
columns[index]["sort_ascending"] = sort_ascending; columns[index]["sort_ascending"] = sort_ascending;
}
S32 columnwidth = -1; S32 columnwidth = -1;
if (child->getAttributeS32("width", columnwidth)) if (child->getAttributeS32("width", columnwidth))