diff options
author | Merov Linden <merov@lindenlab.com> | 2012-11-26 15:01:57 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-11-26 15:01:57 -0800 |
commit | 8076f7a33d7f5ee93d4ba8f71a7ba0fed5e364a7 (patch) | |
tree | 6a7d0f88666e16948e73d1098c99edc7513b6e49 /indra/llui/llscrolllistcolumn.cpp | |
parent | 7ca2508cc2adcdc5201bd53e814246e156bc6013 (diff) | |
parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) |
Pull merge from richard/viewer-chui
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 |