From 536e38ad51b89808f26d8e3cd107fe093862d22a Mon Sep 17 00:00:00 2001
From: David Parks <davep@lindenlab.com>
Date: Tue, 22 Sep 2009 11:11:45 +0000
Subject: Merging render-pipeline-6-qa-2 into viewer-2

Self reviewed.
---
 indra/llui/llview.cpp | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'indra/llui/llview.cpp')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 46510804f8..8d723877d6 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -143,6 +143,7 @@ LLView::LLView(const LLView::Params& p)
 
 LLView::~LLView()
 {
+	dirtyRect();
 	//llinfos << "Deleting view " << mName << ":" << (void*) this << llendl;
 // 	llassert(LLView::sIsDrawing == FALSE);
 	
@@ -602,6 +603,7 @@ void LLView::setVisible(BOOL visible)
 		if (!getParent() || getParent()->isInVisibleChain())
 		{
 			// tell all children of this view that the visibility may have changed
+			dirtyRect();
 			handleVisibilityChange( visible );
 		}
 		updateBoundingRect();
@@ -1297,7 +1299,7 @@ void LLView::drawChildren()
 			{
 				// Only draw views that are within the root view
 				localRectToScreen(viewp->getRect(),&screenRect);
-				if ( rootRect.overlaps(screenRect) )
+				if ( rootRect.overlaps(screenRect)  && LLUI::sDirtyRect.overlaps(screenRect))
 				{
 					glMatrixMode(GL_MODELVIEW);
 					LLUI::pushMatrix();
@@ -1316,6 +1318,21 @@ void LLView::drawChildren()
 	gGL.getTexUnit(0)->disable();
 }
 
+void LLView::dirtyRect()
+{
+	LLView* child = getParent();
+	LLView* parent = child ? child->getParent() : NULL;
+	LLView* cur = this;
+	while (child && parent && parent->getParent())
+	{ //find third to top-most view
+		cur = child;
+		child = parent;
+		parent = parent->getParent();
+	}
+
+	LLUI::dirtyRect(cur->calcScreenRect());
+}
+
 //Draw a box for debugging.
 void LLView::drawDebugRect()
 {
@@ -1529,6 +1546,8 @@ void LLView::updateBoundingRect()
 {
 	if (isDead()) return;
 
+	LLRect cur_rect = mBoundingRect;
+
 	if (mUseBoundingRect)
 	{
 		mBoundingRect = calcBoundingRect();
@@ -1543,6 +1562,12 @@ void LLView::updateBoundingRect()
 	{
 		getParent()->updateBoundingRect();
 	}
+
+	if (mBoundingRect != cur_rect)
+	{
+		dirtyRect();
+	}
+
 }
 
 LLRect LLView::calcScreenRect() const
-- 
cgit v1.2.3


From afcdda2e361855e2a02eb39c8cec080019ac769f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 23 Sep 2009 22:25:18 +0000
Subject: EXT-904 	Build tools does not show tooltips on any checkbox
 EXT-877 	There is no tooltip with a date for Time indicator in Nav bar
 EXT-860 	Crosshairs and "Press ESC to..." warning are dislocated in
 mouselook mode when UI Size is not exactly set to 1.00 (Menu Me ->
 Preferences-> Graphics) EXT-783 	Script editor inserts text twice when
 using the editors paste, or choosing LSL elements from the pull-down list.
 EXT-764 	mis-location of cursor in edit script panel (fixed cursor
 width) EXT-658 	Inventory window's "Fetched Items" needs spacing

reviewed by James
---
 indra/llui/llview.cpp | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'indra/llui/llview.cpp')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 8d723877d6..256c776293 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -675,9 +675,13 @@ LLView* LLView::childrenHandleToolTip(S32 x, S32 y, std::string& msg, LLRect& st
 		LLView* viewp = *child_it;
 		S32 local_x = x - viewp->getRect().mLeft;
 		S32 local_y = y - viewp->getRect().mBottom;
-		if(viewp->pointInView(local_x, local_y) &&
-			viewp->getVisible() &&
-			viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen) )
+		if(!viewp->pointInView(local_x, local_y) ||
+			!viewp->getVisible())
+		{
+			continue;
+		}
+
+		if(viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen) )
 		{
 			if (sDebugMouseHandling)
 			{
@@ -687,17 +691,22 @@ LLView* LLView::childrenHandleToolTip(S32 x, S32 y, std::string& msg, LLRect& st
 			handled_view = viewp;
 			break;
 		}
+
+		if( viewp->blockMouseEvent(x, y) )
+		{
+			handled_view = viewp;
+		}
 	}
 	return handled_view;
 }
 
 BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect& sticky_rect_screen)
 {
-	LLView* child_handler = childrenHandleToolTip(x, y, msg, sticky_rect_screen);
-	BOOL handled = child_handler != NULL;
+	BOOL handled = FALSE;
 
-	// child widgets get priority on tooltips
-	if (!handled && !mToolTipMsg.empty())
+	// parents provide tooltips first, which are optionally
+	// overridden by children
+	if (!mToolTipMsg.empty())
 	{
 		// allow "scrubbing" over ui by showing next tooltip immediately
 		// if previous one was still visible
@@ -712,7 +721,9 @@ BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect& sticky_rect_s
 		handled = TRUE;
 	}
 
-	if( blockMouseEvent(x, y) )
+	// child tooltips will override our own
+	LLView* child_handler = childrenHandleToolTip(x, y, msg, sticky_rect_screen);
+	if (child_handler)
 	{
 		handled = TRUE;
 	}
-- 
cgit v1.2.3