cedric pushed a commit to branch master.
commit b343874300c9de53ab50c9c5366897a0487542bf
Author: Cedric Bail <[email protected]>
Date: Thu Jul 18 20:18:43 2013 +0900
edje: fix typo and deep apology to asdfuser.
---
src/lib/edje/edje_calc.c | 2 +-
src/tests/edje/edje_test_edje.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index b582448..26d3e42 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2434,7 +2434,7 @@ _edje_part_recalc_single(Edje *ed,
params->final.w += 1;
else if (params->final.x + params->final.w >
TO_INT(ADD(params->eval.x, params->eval.w)))
params->final.w -= 1;
- if (params->final.y + params->final.h < TO_INT(ADD(params->eval.y,
params->eval.y)))
+ if (params->final.y + params->final.h < TO_INT(ADD(params->eval.y,
params->eval.h)))
params->final.h += 1;
else if (params->final.y + params->final.h >
TO_INT(ADD(params->eval.y, params->eval.h)))
params->final.h -= 1;
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 7a31436..d771d5e 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -144,7 +144,7 @@ START_TEST(edje_test_complex_layout)
* rel2.relative: 1.0 1.0; rel2.offset -5 -5; */
edje_object_part_geometry_get(obj, "l", &x, &y, &w, &h);
fail_if(x != 5 || y != 500+2);
- fail_if(w != 1000-5-5 + 1 || h != 500-5-2 + 2);
+ fail_if(w != 1000-5-5 + 1 || h != 500-5-2 + 1);
EDJE_TEST_FREE_EVAS();
}
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
