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

[LLScrollColumnHeader] Fix icons disappearing in certain states, such as click.

Browse Source
This commit is contained in:
Inusaito Sayori
2013-11-10 02:46:23 -05:00
parent c629d2625c
commit a510af9480
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
indra/llui/llscrolllistctrl.cpp
View File

@@ -2848,24 +2848,27 @@ void LLScrollListCtrl::addColumn(const LLScrollListColumn::Params& column_params
LLRect temp_rect = LLRect(left,top+mHeadingHeight,right,top);
new_column->mHeader = new LLScrollColumnHeader("btn_" + name, temp_rect, new_column);
new_column->mHeader->setToolTip(column_params.tool_tip());
new_column->mHeader->setTabStop(false);
new_column->mHeader->setVisible(mDisplayColumnHeaders);
if(column_params.header.image.isProvided())
if (column_params.header.image.isProvided())
{
new_column->mHeader->setImages(column_params.header.image, column_params.header.image);
}
else if(column_params.header.image_overlay.isProvided())
{
new_column->mHeader->setImageOverlay(column_params.header.image_overlay);
new_column->mHeader = new LLScrollColumnHeader("btn_" + name, temp_rect, new_column, column_params.header.image, column_params.header.image);
}
else
{
new_column->mHeader->setLabel(column_params.header.label());
new_column->mHeader = new LLScrollColumnHeader("btn_" + name, temp_rect, new_column);
if (column_params.header.image_overlay.isProvided())
{
new_column->mHeader->setImageOverlay(column_params.header.image_overlay);
}
else
{
new_column->mHeader->setLabel(column_params.header.label());
}
}
new_column->mHeader->setToolTip(column_params.tool_tip());
new_column->mHeader->setTabStop(false);
new_column->mHeader->setVisible(mDisplayColumnHeaders);
addChild(new_column->mHeader);
sendChildToFront(mScrollbar);