livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout 95f63ec5a5b5

Ansariel 2013-07-29 22:39:17 +02:00
parent 5026233031
commit 3f87c18912
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/llscrolllistcolumn.cpp
View File

@ -236,11 +236,6 @@ void LLScrollColumnHeader::handleReshape(const LLRect& new_rect, bool by_user)
// tell scroll list to layout columns again
// do immediate update to get proper feedback to resize handle
// which needs to know how far the resize actually went
// <FS:Ansariel> FIRE-8911/MAINT-2223: Fix for broken column resize
// Need to set mColumnsDirty via dirtyColumns() first
// or nothing would happen at all!
mColumn->mParentCtrl->dirtyColumns();
// </FS:Ansariel>
mColumn->mParentCtrl->updateColumns();
}
}

26
indra/llui/llscrolllistctrl.cpp
View File

@ -647,12 +647,7 @@ S32 LLScrollListCtrl::calcMaxContentWidth()
if (mColumnWidthsDirty)
{
// <FS:Ansariel> FIRE-8911/MAINT-2223: Fix for broken column resize
// This seems to be misplaced here as we would only
// take the first column into account for max
// content width calculation.
//mColumnWidthsDirty = false;
// </FS:Ansariel>
mColumnWidthsDirty = false;
// update max content width for this column, by looking at all items
column->mMaxContentWidth = column->mHeader ? LLFontGL::getFontSansSerifSmall()->getWidth(column->mLabel) + mColumnPadding + HEADING_TEXT_PADDING : 0;
item_list::iterator iter;
@ -666,9 +661,6 @@ S32 LLScrollListCtrl::calcMaxContentWidth()
}
max_item_width += column->mMaxContentWidth;
}
// <FS:Ansariel> FIRE-8911/MAINT-2223: Fix for broken column resize
mColumnWidthsDirty = false;
// </FS:Ansariel>
return max_item_width;
}
@ -693,17 +685,11 @@ bool LLScrollListCtrl::updateColumnWidths()
new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding) / mNumDynamicWidthColumns;
}
// <FS:Ansariel> FIRE-8911/MAINT-2223: Fix for broken column resize
// This apparently doesn't work as it should, preventing
// a proper resize. Fall back to pre-3.4.3 behavior and
// always assume a changed width.
//if (column->getWidth() != new_width)
//{
// column->setWidth(new_width);
// width_changed = true;
//}
width_changed = true;
// </FS:Ansariel>
if (column->getWidth() != new_width)
{
column->setWidth(new_width);
width_changed = true;
}
}
return width_changed;
}