Merge

3 files changed, 36 insertions, 28 deletions

diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index f6caed4617..a5e47e8547 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -235,18 +235,37 @@ BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask)
 
 BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks )
 {
-	if(LLUICtrl::handleScrollWheel(x,y,clicks))
+	// Give event to my child views - they may have scroll bars
+	// (Bad UI design, but technically possible.)
+	if (LLUICtrl::handleScrollWheel(x,y,clicks))
 		return TRUE;
-	for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
-	{
-		// Note: tries vertical and then horizontal
 
+	// When the vertical scrollbar is visible, scroll wheel
+	// only affects vertical scrolling.  It's confusing to have
+	// scroll wheel perform both vertical and horizontal in a
+	// single container.
+	LLScrollbar* vertical = mScrollbar[VERTICAL];
+	if (vertical->getVisible()
+		&& vertical->getEnabled())
+	{
 		// Pretend the mouse is over the scrollbar
-		if( mScrollbar[i]->handleScrollWheel( 0, 0, clicks ) )
+		if (vertical->handleScrollWheel( 0, 0, clicks ) )
 		{
 			updateScroll();
-			return TRUE;
 		}
+		// Always eat the event
+		return TRUE;
+	}
+
+	LLScrollbar* horizontal = mScrollbar[HORIZONTAL];
+	// Test enablement and visibility for consistency with
+	// LLView::childrenHandleScrollWheel().
+	if (horizontal->getVisible()
+		&& horizontal->getEnabled()
+		&& horizontal->handleScrollWheel( 0, 0, clicks ) )
+	{
+		updateScroll();
+		return TRUE;
 	}
 	return FALSE;
 }
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 82a3c5cf47..e0750968ae 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -194,7 +194,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 	mHAlign(p.font_halign),
 	mLineSpacingMult(p.line_spacing.multiple),
 	mLineSpacingPixels(p.line_spacing.pixels),
-	mClipPartial(p.clip_partial),
+	mClipPartial(p.clip_partial && !p.allow_scroll),
 	mTrackEnd( p.track_end ),
 	mScrollIndex(-1),
 	mSelectionStart( 0 ),
@@ -529,11 +529,6 @@ void LLTextBase::drawText()
 		S32 next_line = cur_line + 1;
 		line_info& line = mLineInfoList[cur_line];
 
-		if ((line.mRect.mTop - scrolled_view_rect.mBottom) < mTextRect.mBottom) 
-		{
-			break;
-		}
-
 		S32 next_start = -1;
 		S32 line_end = text_len;
 
@@ -543,17 +538,9 @@ void LLTextBase::drawText()
 			line_end = next_start;
 		}
 
-		// A patch for EXT-1944 "Implement ellipses in message well" 
-		// introduced a regression where text in SansSerif ending in the
-		// letter "r" is clipped.  This may be due to an off-by-one in
-		// font width information out of FreeType with our fractional font
-		// sizes.  For now, just make an extra pixel of space to resolve
-		// EXT-2971 "Letter R doesn't show when it's the last letter in a
-		// text block".  See James/Richard for details.
-		const S32 FIX_CLIPPING_HACK = 1;
 		LLRect text_rect(line.mRect.mLeft + mTextRect.mLeft - scrolled_view_rect.mLeft,
 						line.mRect.mTop - scrolled_view_rect.mBottom + mTextRect.mBottom,
-						llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft + FIX_CLIPPING_HACK,
+						llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft,
 						line.mRect.mBottom - scrolled_view_rect.mBottom + mTextRect.mBottom);
 
 		// draw a single line of text
@@ -1086,6 +1073,10 @@ void LLTextBase::reflow(S32 start_index)
 	{
 		mReflowNeeded = FALSE;
 
+		// shrink document to minimum size (visible portion of text widget)
+		// to force inlined widgets with follows set to shrink
+		mDocumentView->setShape(mTextRect);
+
 		bool scrolled_to_bottom = mScroller ? mScroller->isAtBottom() : false;
 
 		LLRect old_cursor_rect = getLocalRectFromDocIndex(mCursorPos);
@@ -1348,13 +1339,11 @@ std::pair<S32, S32>	LLTextBase::getVisibleLines(bool fully_visible)
 
 	if (fully_visible)
 	{
-		// binary search for line that starts before top of visible buffer and starts before end of visible buffer
 		first_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_top());
 		last_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mBottom, compare_bottom());
 	}
 	else
 	{
-		// binary search for line that starts before top of visible buffer and starts before end of visible buffer
 		first_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_bottom());
 		last_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mBottom, compare_top());
 	}
@@ -2105,7 +2094,7 @@ void LLTextBase::updateRects()
 	LLRect doc_rect = mContentsRect;
 	// use old mTextRect constraint document to width of viewable region
 	doc_rect.mLeft = 0;
-	doc_rect.mRight = mTextRect.getWidth();
+	doc_rect.mRight = llmax(mTextRect.getWidth(), mContentsRect.mRight);
 
 	mDocumentView->setShape(doc_rect);
 
@@ -2125,7 +2114,7 @@ void LLTextBase::updateRects()
 	}
 
 	// update document container again, using new mTextRect
-	doc_rect.mRight = doc_rect.mLeft + mTextRect.getWidth();
+	doc_rect.mRight = llmax(mTextRect.getWidth(), mContentsRect.mRight);
 	mDocumentView->setShape(doc_rect);
 }
 
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 4cf503b413..6603887905 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -1847,8 +1847,8 @@ LLControlGroup& LLUI::getControlControlGroup (const std::string& controlname)
 // spawn_x and spawn_y are top left corner of view in screen GL coordinates
 void LLUI::positionViewNearMouse(LLView* view, S32 spawn_x, S32 spawn_y)
 {
-	const S32 CURSOR_HEIGHT = 18;		// Approximate "normal" cursor size
-	const S32 CURSOR_WIDTH = 9;
+	const S32 CURSOR_HEIGHT = 16;		// Approximate "normal" cursor size
+	const S32 CURSOR_WIDTH = 8;
 
 	LLView* parent = view->getParent();
 
@@ -1866,7 +1866,7 @@ void LLUI::positionViewNearMouse(LLView* view, S32 spawn_x, S32 spawn_y)
 	LLRect virtual_window_rect = parent->getLocalRect();
 
 	LLRect mouse_rect;
-	const S32 MOUSE_CURSOR_PADDING = 5;
+	const S32 MOUSE_CURSOR_PADDING = 1;
 	mouse_rect.setLeftTopAndSize(mouse_x - MOUSE_CURSOR_PADDING, 
 								mouse_y + MOUSE_CURSOR_PADDING, 
 								CURSOR_WIDTH + MOUSE_CURSOR_PADDING * 2,