Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whoopsies! Fixed some broken ui logic from first llmath merge.

Browse Source
This commit is contained in:
Shyotl
2011-02-23 02:54:00 -06:00
parent 3deb857ba1
commit 6fb8f9bc96
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llfloater.cpp
View File

@@ -1910,7 +1910,7 @@ LLRect LLFloaterView::findNeighboringPosition( LLFloater* reference_floater, LLF
if (sibling && if (sibling &&
sibling != neighbor && sibling != neighbor &&
sibling->getVisible() && sibling->getVisible() &&
expanded_base_rect.contains(sibling->getRect())) expanded_base_rect.overlaps(sibling->getRect()))
{ {
base_rect.unionWith(sibling->getRect()); base_rect.unionWith(sibling->getRect());
} }

2
indra/llui/llview.cpp
View File

@@ -1355,7 +1355,7 @@ void LLView::draw()
{ {
// Only draw views that are within the root view // Only draw views that are within the root view
localRectToScreen(viewp->getRect(),&screenRect); localRectToScreen(viewp->getRect(),&screenRect);
if ( rootRect.contains(screenRect) ) if ( rootRect.overlaps(screenRect) )
{ {
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
LLUI::pushMatrix(); LLUI::pushMatrix();

2
indra/newview/llhudtext.cpp
View File

@@ -1049,7 +1049,7 @@ void LLHUDText::updateAll()
{ {
continue; continue;
} }
if (src_textp->mSoftScreenRect.contains(dst_textp->mSoftScreenRect)) if (src_textp->mSoftScreenRect.overlaps(dst_textp->mSoftScreenRect))
{ {
LLRectf intersect_rect = src_textp->mSoftScreenRect; LLRectf intersect_rect = src_textp->mSoftScreenRect;
intersect_rect.intersectWith(dst_textp->mSoftScreenRect); intersect_rect.intersectWith(dst_textp->mSoftScreenRect);