From 54bc9e18a92d03efbb13fdde43601207d21ef404 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 16 Jul 2013 05:32:11 -0400 Subject: [PATCH] Take advantage of the LLButton constructor for setting defaults of LLScrollColumnHeader --- indra/llui/llscrolllistcolumn.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp index 325aed7cb..0cc0fe62a 100644 --- a/indra/llui/llscrolllistcolumn.cpp +++ b/indra/llui/llscrolllistcolumn.cpp @@ -40,22 +40,11 @@ const S32 MIN_COLUMN_WIDTH = 20; // LLScrollColumnHeader //--------------------------------------------------------------------------- LLScrollColumnHeader::LLScrollColumnHeader(const std::string& name, const LLRect& rect, LLScrollListColumn* column) -: LLButton("", rect), +: LLButton(name, rect, "square_btn_32x128.tga", "square_btn_selected_32x128.tga", LLStringUtil::null, NULL, LLFontGL::getFontSansSerifSmall()), mColumn(column), mHasResizableElement(FALSE) { setClickedCallback(boost::bind(&LLScrollColumnHeader::onClick, this, _2)); - setName(name); // Singu Note: Passing this to LLButton set the label, too, which we don't want in the case of column headers with images. - // Set base images for column header button - { - LLPointer selected = LLUI::getUIImage("square_btn_selected_32x128.tga"); - LLPointer unselected = LLUI::getUIImage("square_btn_32x128.tga"); - setImageUnselected(unselected); - setImageSelected(selected); - setImageDisabled(unselected); - setImageDisabledSelected(selected); - } - setFont(LLFontGL::getFontSansSerifSmall()); setHAlign(LLFontGL::LEFT); // resize handles on left and right