From 70f096e9bb499c449974f9795dc8afb050840f97 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 12 Sep 2014 14:49:38 +0200 Subject: [PATCH] Addendum to previous commit: Create the textbox after the border to keep the order --- indra/llui/llscrolllistctrl.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 657045cf28..c352368bed 100755 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -240,20 +240,6 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p) mScrollbar = LLUICtrlFactory::create (sbparams); addChild(mScrollbar); - // addRow() will call updateLayout() that tries to access the the comment - // textbox. So create it first before adding rows! - LLTextBox::Params text_p; - text_p.name("comment_text"); - text_p.border_visible(false); - text_p.rect(mItemListRect); - text_p.follows.flags(FOLLOWS_ALL); - // word wrap was added accroding to the EXT-6841 - text_p.wrap(true); - // set up label text color for empty lists in a way it's always readable -Zi - text_p.text_color = mFgUnselectedColor; - addChild(LLUICtrlFactory::create(text_p)); - // - // Border if (p.has_border) { @@ -271,6 +257,20 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p) mBorder->reshape(getRect().getWidth(), getRect().getHeight()); } + // addRow() will call updateLayout() that tries to access the the comment + // textbox. So create it first before adding rows! + LLTextBox::Params text_p; + text_p.name("comment_text"); + text_p.border_visible(false); + text_p.rect(mItemListRect); + text_p.follows.flags(FOLLOWS_ALL); + // word wrap was added accroding to the EXT-6841 + text_p.wrap(true); + // set up label text color for empty lists in a way it's always readable -Zi + text_p.text_color = mFgUnselectedColor; + addChild(LLUICtrlFactory::create(text_p)); + // + if (p.sort_column >= 0) { sortByColumnIndex(p.sort_column, p.sort_ascending);