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

FIRE-8911 / MAINT-2223: Experimental fix for scroll list columns not resizing properly anymore

Ansariel 2013-02-14 20:08:51 +01:00
parent d829faef75
commit 320baa9646
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/llscrolllistcolumn.cpp
View File

@ -236,6 +236,11 @@ 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,7 +647,12 @@ S32 LLScrollListCtrl::calcMaxContentWidth()
if (mColumnWidthsDirty)
{
mColumnWidthsDirty = false;
// <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>
// 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;
@ -661,6 +666,9 @@ 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;
}
@ -685,11 +693,17 @@ bool LLScrollListCtrl::updateColumnWidths()
new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding) / mNumDynamicWidthColumns;
}
if (column->getWidth() != new_width)
{
column->setWidth(new_width);
width_changed = true;
}
// <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>
}
return width_changed;
}