diff options
| author | James Cook <james@lindenlab.com> | 2009-12-01 11:45:45 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-01 11:45:45 -0800 |
| commit | 8025c15a71fa1ee9fa34781f7cf74dde8c4e622b (patch) | |
| tree | ed1bc960a53ee288b8cfc42bfadca736ce57bc4e /indra/llui | |
| parent | 21a2cae9993ac460f37bec3fc7aaae3d719339f1 (diff) | |
| parent | 594f96b92ee86570d1973510a44a494dc520b523 (diff) | |
merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/lltextbase.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 8a33619b58..53c5a8d07d 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -111,8 +111,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p) LLView::addChild( mBorder ); mInnerRect.set( 0, getRect().getHeight(), getRect().getWidth(), 0 ); - if ( mBorder->getVisible() ) - mInnerRect.stretch( -mBorder->getBorderWidth() ); + mInnerRect.stretch( -mBorder->getBorderWidth() ); LLRect vertical_scroll_rect = mInnerRect; vertical_scroll_rect.mLeft = vertical_scroll_rect.mRight - scrollbar_size; @@ -190,8 +189,7 @@ void LLScrollContainer::reshape(S32 width, S32 height, LLUICtrl::reshape( width, height, called_from_parent ); mInnerRect = getLocalRect(); - if ( mBorder->getVisible() ) - mInnerRect.stretch( -mBorder->getBorderWidth() ); + mInnerRect.stretch( -mBorder->getBorderWidth() ); if (mScrolledView) { diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 64164df17f..db16670f79 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2096,7 +2096,8 @@ void LLTextBase::updateRects() // update document container dimensions according to text contents LLRect doc_rect = mContentsRect; // use old mTextRect constraint document to width of viewable region - doc_rect.mRight = doc_rect.mLeft + mTextRect.getWidth(); + doc_rect.mLeft = 0; + doc_rect.mRight = mTextRect.getWidth(); mDocumentView->setShape(doc_rect); |