From 90cd40753dc1e59622c174585282210cacbcd30e Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 3 Feb 2014 15:35:36 +0900 Subject: [PATCH] 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 --- AUTHORS | 1 + src/lib/eina/eina_inline_rectangle.x | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 35068f19fb..dd4e277d0e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -49,6 +49,7 @@ Patryk Kaczmarek Igor Murzov Vladislav Brovko ChunEon Park (Hermet) +Rajeev Ranjan (Rajeev) Eet --- diff --git a/src/lib/eina/eina_inline_rectangle.x b/src/lib/eina/eina_inline_rectangle.x index d89d7f1b34..e25942bd46 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; } /**