From f60c798f1d64a383a4d171fc3e99140aa236dc97 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Thu, 25 Jun 2009 10:58:16 +0000
Subject: [PATCH] 	* eina: Fix rectangle merge.

SVN revision: 41193
---
 legacy/eina/src/lib/eina_rectangle.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/legacy/eina/src/lib/eina_rectangle.c b/legacy/eina/src/lib/eina_rectangle.c
index e147d9f529..9a898f36a9 100644
--- a/legacy/eina/src/lib/eina_rectangle.c
+++ b/legacy/eina/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;