diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-01-11 13:07:01 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-01-11 13:07:01 +0200 |
| commit | 187caf851561aa874d598763d0a7a6a8862a79de (patch) | |
| tree | 76cdab325662ae63b274d890e2956c86da9f2ce9 | |
| parent | 5b2ddae9994e251502b02e81f9ef24a7024340be (diff) | |
MAINT-2001 Fixed the width of columns cannot be changed in Inspect Object
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_inspect.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index db8fdc46b7..1190c5bb94 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -648,7 +648,7 @@ bool LLScrollListCtrl::updateColumnWidths() S32 new_width = 0; if (column->mRelWidth >= 0) { - new_width = (S32)ll_round(column->mRelWidth*mItemListRect.getWidth()); + new_width = (S32)ll_round(column->mRelWidth * (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding)); } else if (column->mDynamicWidth) { @@ -2680,7 +2680,7 @@ void LLScrollListCtrl::addColumn(const LLScrollListColumn::Params& column_params } if (new_column->mRelWidth >= 0) { - new_column->setWidth((S32)ll_round(new_column->mRelWidth*mItemListRect.getWidth())); + new_column->setWidth((S32)ll_round(new_column->mRelWidth * (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding))); } else if(new_column->mDynamicWidth) { diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index bea35e5fc1..ae46736ddf 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -27,15 +27,15 @@ tool_tip="Select an object from this list to highlight it in-world" top="20"> <scroll_list.columns - dynamic_width="true" + relative_width="0.32" label="Object Name" name="object_name" /> <scroll_list.columns - dynamic_width="true" + relative_width="0.34" label="Owner Name" name="owner_name" /> <scroll_list.columns - dynamic_width="true" + relative_width="0.34" label="Creator Name" name="creator_name" /> <scroll_list.columns |