mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 18:50:48 +00:00
Tidied
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8816 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
aa57ff1a1d
commit
02c8f3078b
1 changed files with 32 additions and 14 deletions
|
@ -82,7 +82,9 @@
|
|||
|
||||
/* if there are less the two subviews, there is nothing to do */
|
||||
if (count < 2)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
vis = [self visibleRect];
|
||||
|
||||
|
@ -111,7 +113,9 @@
|
|||
|
||||
/* get the enclosing rect for the two views */
|
||||
if (prev)
|
||||
{
|
||||
r = [prev frame];
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
|
@ -120,8 +124,10 @@
|
|||
*/
|
||||
return;
|
||||
}
|
||||
if (v)
|
||||
if (v != nil)
|
||||
{
|
||||
r1 = [v frame];
|
||||
}
|
||||
bigRect = r;
|
||||
bigRect = NSUnionRect(r1, bigRect);
|
||||
tempView = prev; prev = v; v = tempView;
|
||||
|
@ -136,8 +142,10 @@
|
|||
offset = i;
|
||||
|
||||
/* get the enclosing rect for the two views */
|
||||
if (prev)
|
||||
if (prev != nil)
|
||||
{
|
||||
r = [prev frame];
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
|
@ -146,8 +154,10 @@
|
|||
*/
|
||||
return;
|
||||
}
|
||||
if (v)
|
||||
if (v != nil)
|
||||
{
|
||||
r1 = [v frame];
|
||||
}
|
||||
bigRect = r;
|
||||
bigRect = NSUnionRect(r1 , bigRect);
|
||||
break;
|
||||
|
@ -186,10 +196,14 @@
|
|||
ofSubviewAt: offset];
|
||||
/* we are still constrained by the original bounds */
|
||||
if (delMinY > minCoord)
|
||||
{
|
||||
minCoord = delMinY;
|
||||
}
|
||||
if (delMaxY < maxCoord)
|
||||
{
|
||||
maxCoord = delMaxY;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
float delMinX= minCoord, delMaxX= maxCoord;
|
||||
|
@ -199,11 +213,15 @@
|
|||
ofSubviewAt: offset];
|
||||
/* we are still constrained by the original bounds */
|
||||
if (delMinX > minCoord)
|
||||
{
|
||||
minCoord = delMinX;
|
||||
}
|
||||
if (delMaxX < maxCoord)
|
||||
{
|
||||
maxCoord = delMaxX;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
oldRect = NSZeroRect;
|
||||
[self lockFocus];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue