Skip to content
Snippets Groups Projects
Commit 0a729077 authored by richard's avatar richard
Browse files

moved scroll_column_header default params to scroll_column_header.xml

reviewed by James
parent b7b499da
No related branches found
No related tags found
No related merge requests found
......@@ -44,6 +44,9 @@
const S32 MIN_COLUMN_WIDTH = 20;
// defaults for LLScrollColumnHeader param block pulled from widgets/scroll_column_header.xml
static LLWidgetNameRegistry::StaticRegistrar sRegisterColumnHeaderParams(&typeid(LLScrollColumnHeader::Params), "scroll_column_header");
//---------------------------------------------------------------------------
// LLScrollColumnHeader
//---------------------------------------------------------------------------
......@@ -51,15 +54,7 @@ LLScrollColumnHeader::Params::Params()
: column("column")
{
name = "column_header";
image_unselected.name("square_btn_32x128.tga");
image_selected.name("square_btn_selected_32x128.tga");
image_disabled.name("square_btn_32x128.tga");
image_disabled_selected.name("square_btn_selected_32x128.tga");
image_overlay.name("combobox_arrow.tga");
image_overlay_alignment("right");
font_halign = LLFontGL::LEFT;
tab_stop(false);
scale_image(true);
}
......
......@@ -2624,7 +2624,7 @@ void LLScrollListCtrl::addColumn(const LLScrollListColumn::Params& column_params
LLRect temp_rect = LLRect(left,top+mHeadingHeight,right,top);
LLScrollColumnHeader::Params params;
LLScrollColumnHeader::Params params(LLUICtrlFactory::getDefaultParams<LLScrollColumnHeader>());
params.name = "btn_" + name;
params.rect = temp_rect;
params.column = new_column;
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<scroll_column_header image_unselected="square_btn_32x128.tga"
image_selected="square_btn_selected_32x128.tga"
image_disabled="square_btn_32x128.tga"
image_disabled_selected="square_btn_selected_32x128.tga"
image_overlay="combobox_arrow.tga"
image_overlay_alignment="right"
halign="left"
scale_image="true"/>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment