From 07cc16f4796e571eb804866493e87d777bdead46 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 6 Feb 2017 17:29:45 +0200
Subject: [PATCH] MAINT-2001 Fixes colums misbeheaving
---
indra/llui/llscrolllistctrl.cpp | 4 ++--
indra/newview/skins/default/xui/en/floater_inspect.xml | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 1190c5bb944..db8fdc46b71 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() - mTotalStaticColumnWidth - mTotalColumnPadding));
+ new_width = (S32)ll_round(column->mRelWidth*mItemListRect.getWidth());
}
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() - mTotalStaticColumnWidth - mTotalColumnPadding)));
+ new_column->setWidth((S32)ll_round(new_column->mRelWidth*mItemListRect.getWidth()));
}
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 ae46736ddf9..63334e2b241 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -27,21 +27,21 @@
tool_tip="Select an object from this list to highlight it in-world"
top="20">
<scroll_list.columns
- relative_width="0.32"
+ relative_width="0.25"
label="Object Name"
name="object_name" />
<scroll_list.columns
- relative_width="0.34"
+ relative_width="0.25"
label="Owner Name"
name="owner_name" />
<scroll_list.columns
- relative_width="0.34"
+ relative_width="0.25"
label="Creator Name"
name="creator_name" />
<scroll_list.columns
+ relative_width="0.25"
label="Creation Date"
- name="creation_date"
- width="150" />
+ name="creation_date" />
<scroll_list.commit_callback
function="Inspect.SelectObject" />
</scroll_list>
--
GitLab