summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2014-02-03 15:35:36 +0900
committerCedric BAIL <cedric.bail@samsung.com>2014-02-03 15:35:44 +0900
commit90cd40753dc1e59622c174585282210cacbcd30e (patch)
tree85af8c32679ccd9379a55354431085ec27a98c46
parentef2127c900398ab35972ec2ec622f2bcb85d010c (diff)
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.bail@samsung.com>
Diffstat (limited to '')
-rw-r--r--AUTHORS1
-rw-r--r--src/lib/eina/eina_inline_rectangle.x4
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 <patryk.k@samsung.com>
49Igor Murzov <e-mail@date.by> 49Igor Murzov <e-mail@date.by>
50Vladislav Brovko <v.brovko@samsung.com> 50Vladislav Brovko <v.brovko@samsung.com>
51ChunEon Park (Hermet) <hermet@hermet.pe.kr> 51ChunEon Park (Hermet) <hermet@hermet.pe.kr>
52Rajeev Ranjan (Rajeev) <rajeev.r@samsung.com> <rajeev.jnnce@gmail.com>
52 53
53Eet 54Eet
54--- 55---
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)
173 } 173 }
174 /* right */ 174 /* right */
175 if ((dst->x + dst->w) < (src->x + src->w)) 175 if ((dst->x + dst->w) < (src->x + src->w))
176 dst->w = src->x + src->w; 176 dst->w = src->x + src->w - dst->x;
177 /* top */ 177 /* top */
178 if (dst->y > src->y) 178 if (dst->y > src->y)
179 { 179 {
@@ -182,7 +182,7 @@ eina_rectangle_union(Eina_Rectangle *dst, const Eina_Rectangle *src)
182 } 182 }
183 /* bottom */ 183 /* bottom */
184 if ((dst->y + dst->h) < (src->y + src->h)) 184 if ((dst->y + dst->h) < (src->y + src->h))
185 dst->h = src->y + src->h; 185 dst->h = src->y + src->h - dst->y;
186} 186}
187 187
188/** 188/**