From 7c6b3b1d4a2efb19fdf3c1d79cb97880b93f8d3a Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Wed, 7 Aug 2013 18:40:23 +0900 Subject: [PATCH] edje: fix off-by-one when x or y where negative. --- src/lib/edje/edje_calc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index fac832f7a0..b4ebcae1d6 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -2357,19 +2357,19 @@ _edje_part_recalc_single(Edje *ed, when doing min restricted calc */ if (!ed->calc_only) { - if (params->final.x + params->final.w < TO_INT(ADD(params->eval.x, params->eval.w))) + if (ABS(params->final.x) + params->final.w < TO_INT(ADD(ABS(params->eval.x), params->eval.w))) { params->final.w += 1; } - else if (params->final.x + params->final.w > TO_INT(ADD(params->eval.x, params->eval.w))) + else if (ABS(params->final.x) + params->final.w > TO_INT(ADD(ABS(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.h))) + if (ABS(params->final.y) + params->final.h < TO_INT(ADD(ABS(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))) + else if (ABS(params->final.y) + params->final.h > TO_INT(ADD(ABS(params->eval.y), params->eval.h))) { params->final.h -= 1; }