enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

* eina: Fix rectangle merge. 

SVN revision: 41193
This commit is contained in:
Cedric BAIL 2009-06-25 10:58:16 +00:00
parent 4c09519e99
commit f60c798f1d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/eina/src/lib/eina_rectangle.c
View File

@ -102,7 +102,8 @@ _eina_rectangle_merge_list(Eina_List *empty, Eina_Rectangle *r)
EINA_LIST_FOREACH(empty, l, match)
{
if (match->x == r->x && match->w == r->w)
if (match->x == r->x && match->w == r->w
&& (match->y == r->y + r->h || r->y == match->y + match->h))
{
if (match->y > r->y)
match->y = r->y;
@ -114,7 +115,8 @@ _eina_rectangle_merge_list(Eina_List *empty, Eina_Rectangle *r)
return _eina_rectangle_merge_list(empty, match);
}
else if (match->y == r->y && match->h == r->h)
else if (match->y == r->y && match->h == r->h
&& (match->x == r->x + r->w || r->x == match->x + match->w))
{
if (match->x > r->x)
match->x = r->x;