diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:31:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:31:01 -0500 |
| commit | f362666df729a6653c04b98d287cfedacaf3ed9f (patch) | |
| tree | f45fda952f6abb3f92ecde17daa22e11f2a1b76e /indra/llui/llscrolllistcolumn.cpp | |
| parent | f99d7bcd475aacffa11b740cf7042cdae77590de (diff) | |
| parent | 6cd16bc537a9978db75e1c1fa0fda0af99cb3cdf (diff) | |
merge changes for DRTVWR-245
Diffstat (limited to 'indra/llui/llscrolllistcolumn.cpp')
| -rw-r--r-- | indra/llui/llscrolllistcolumn.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp index 07a6dfaa10..af124d9826 100644 --- a/indra/llui/llscrolllistcolumn.cpp +++ b/indra/llui/llscrolllistcolumn.cpp @@ -98,6 +98,7 @@ BOOL LLScrollColumnHeader::handleDoubleClick(S32 x, S32 y, MASK mask) if (canResize() && mResizeBar->getRect().pointInRect(x, y)) { // reshape column to max content width + mColumn->mParentCtrl->calcMaxContentWidth(); LLRect column_rect = getRect(); column_rect.mRight = column_rect.mLeft + mColumn->mMaxContentWidth; setShape(column_rect, true); @@ -127,6 +128,8 @@ LLView* LLScrollColumnHeader::findSnapEdge(S32& new_edge_val, const LLCoordGL& m LLRect snap_rect = getSnapRect(); + mColumn->mParentCtrl->calcMaxContentWidth(); + S32 snap_delta = mColumn->mMaxContentWidth - snap_rect.getWidth(); // x coord growing means column growing, so same signs mean we're going in right direction |