Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made things clearer, removed a useless exclude operation

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12901 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca 2005-05-30 14:00:45 +00:00
parent 11a2999d10
commit 9a92483e6f
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/tests/servers/app/newClipping/Clipping.proj
View File

Binary file not shown.

38
src/tests/servers/app/newClipping/Layer.cpp
View File

@ -493,7 +493,7 @@ void Layer::rebuild_visible_regions(const BRegion &invalid,
// no need to go deeper if the parent doesn't have a visible region anymore
// and our fullVisible region is also empty.
if (!parentLocalVisible.Frame().IsValid() && !fFullVisible.Frame().IsValid())
if (!parentLocalVisible.Frame().IsValid() && !(fFullVisible.CountRects() > 0))
return;
bool fullRebuild = false;
@ -501,42 +501,22 @@ void Layer::rebuild_visible_regions(const BRegion &invalid,
// intersect maximum wanted region with the invalid region
BRegion common;
set_user_regions(common);
common.IntersectWith(&invalid);
// if the resulted region is not valid, this layer is not in the catchment area
// of the region being invalidated
if (!common.Frame().IsValid())
if (!common.CountRects() > 0)
return;
// now intersect with parent's visible part of the region that was/is invalidated
common.IntersectWith(&parentLocalVisible);
if (common.Frame().IsValid())
{
// we have something to include to our fullVisible. It may already be in
// there, but we'll never know.
// exclude the invalid region
fFullVisible.Exclude(&invalid);
fVisible.Exclude(&invalid);
// TODO: further analyze the next 2 lines.
fFullVisible.Exclude(&invalid);
fVisible.Exclude(&invalid);
fFullVisible.Include(&common);
}
else
{
// this layer is in the catchment area of the region being invalidated,
// yet it will have no new visible area attached to it. It means
// this layer was overshaddowed by those above it and any visible area
// that it may have common with the region being invalidated, must be
// excluded from it's fFullVisible and fVisible regions.
fFullVisible.Exclude(&invalid);
fVisible.Exclude(&invalid);
// we don't return here becase we want the same thing to happen to all
// our children.
// Don't worry about the last line from this method, it will do nothing -
// common is invalid. Same goes for the last two in the 'for' statement below.
}
// put in what's really visible
fFullVisible.Include(&common);
// this is to allow a layer to hide some parts of itself so children
// won't take them.
@ -553,8 +533,6 @@ void Layer::rebuild_visible_regions(const BRegion &invalid,
// to let children know much they can take from parent's visible region
common.Exclude(&lay->fFullVisible);
// all that a child took must be excluded from our visible region
fVisible.Exclude(&lay->fFullVisible);
// we've hidden some parts of our visible region from our children,
// and we must be in sysnc with this region too...
if (altered)