cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=90cd40753dc1e59622c174585282210cacbcd30e
commit 90cd40753dc1e59622c174585282210cacbcd30e
Author: Cedric BAIL <cedric.b...@samsung.com>
Date: Mon Feb 3 15:35:36 2014 +0900
Patcna: fix wrong widgth and height in eina_rectangle computation logic.
Reviewers: cedric, raster, seoz, Hermet, bluezery
Reviewed By: cedric
Differential Revision: https://phab.enlightenment.org/D500
Signed-off-by: Cedric BAIL <cedric.b...@samsung.com>
---
AUTHORS | 1 +
src/lib/eina/eina_inline_rectangle.x | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 35068f1..dd4e277 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -49,6 +49,7 @@ Patryk Kaczmarek <patry...@samsung.com>
Igor Murzov <e-m...@date.by>
Vladislav Brovko <v.bro...@samsung.com>
ChunEon Park (Hermet) <her...@hermet.pe.kr>
+Rajeev Ranjan (Rajeev) <rajee...@samsung.com> <rajeev.jn...@gmail.com>
Eet
---
diff --git a/src/lib/eina/eina_inline_rectangle.x
b/src/lib/eina/eina_inline_rectangle.x
index d89d7f1..e25942b 100644
--- a/src/lib/eina/eina_inline_rectangle.x
+++ b/src/lib/eina/eina_inline_rectangle.x
@@ -173,7 +173,7 @@ eina_rectangle_union(Eina_Rectangle *dst, const
Eina_Rectangle *src)
}
/* right */
if ((dst->x + dst->w) < (src->x + src->w))
- dst->w = src->x + src->w;
+ dst->w = src->x + src->w - dst->x;
/* top */
if (dst->y > src->y)
{
@@ -182,7 +182,7 @@ eina_rectangle_union(Eina_Rectangle *dst, const
Eina_Rectangle *src)
}
/* bottom */
if ((dst->y + dst->h) < (src->y + src->h))
- dst->h = src->y + src->h;
+ dst->h = src->y + src->h - dst->y;
}
/**
--
