git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8816 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2001-01-26 21:56:34 +00:00
parent aa57ff1a1d
commit 02c8f3078b

View file

@ -82,7 +82,9 @@
/* if there are less the two subviews, there is nothing to do */ /* if there are less the two subviews, there is nothing to do */
if (count < 2) if (count < 2)
{
return; return;
}
vis = [self visibleRect]; vis = [self visibleRect];
@ -111,7 +113,9 @@
/* get the enclosing rect for the two views */ /* get the enclosing rect for the two views */
if (prev) if (prev)
{
r = [prev frame]; r = [prev frame];
}
else else
{ {
/* /*
@ -120,8 +124,10 @@
*/ */
return; return;
} }
if (v) if (v != nil)
{
r1 = [v frame]; r1 = [v frame];
}
bigRect = r; bigRect = r;
bigRect = NSUnionRect(r1, bigRect); bigRect = NSUnionRect(r1, bigRect);
tempView = prev; prev = v; v = tempView; tempView = prev; prev = v; v = tempView;
@ -136,8 +142,10 @@
offset = i; offset = i;
/* get the enclosing rect for the two views */ /* get the enclosing rect for the two views */
if (prev) if (prev != nil)
{
r = [prev frame]; r = [prev frame];
}
else else
{ {
/* /*
@ -146,8 +154,10 @@
*/ */
return; return;
} }
if (v) if (v != nil)
{
r1 = [v frame]; r1 = [v frame];
}
bigRect = r; bigRect = r;
bigRect = NSUnionRect(r1 , bigRect); bigRect = NSUnionRect(r1 , bigRect);
break; break;
@ -186,10 +196,14 @@
ofSubviewAt: offset]; ofSubviewAt: offset];
/* we are still constrained by the original bounds */ /* we are still constrained by the original bounds */
if (delMinY > minCoord) if (delMinY > minCoord)
{
minCoord = delMinY; minCoord = delMinY;
}
if (delMaxY < maxCoord) if (delMaxY < maxCoord)
{
maxCoord = delMaxY; maxCoord = delMaxY;
} }
}
else else
{ {
float delMinX= minCoord, delMaxX= maxCoord; float delMinX= minCoord, delMaxX= maxCoord;
@ -199,11 +213,15 @@
ofSubviewAt: offset]; ofSubviewAt: offset];
/* we are still constrained by the original bounds */ /* we are still constrained by the original bounds */
if (delMinX > minCoord) if (delMinX > minCoord)
{
minCoord = delMinX; minCoord = delMinX;
}
if (delMaxX < maxCoord) if (delMaxX < maxCoord)
{
maxCoord = delMaxX; maxCoord = delMaxX;
} }
} }
}
oldRect = NSZeroRect; oldRect = NSZeroRect;
[self lockFocus]; [self lockFocus];