* eina: Fix rectangle merge.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@41193 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/eina_rectangle.c b/src/lib/eina_rectangle.c
index e147d9f..9a898f3 100644 (file)
--- a/src/lib/eina_rectangle.c
+++ b/src/lib/eina_rectangle.c
@@ -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;