From 59043f13ff3b81ad917c928854f9f7e87cd00fd0 Mon Sep 17 00:00:00 2001 From: cedric Date: Wed, 8 Feb 2012 14:20:29 +0000 Subject: [PATCH] edje: don't update edje calc cache state when only one direction was computed. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@67762 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 6 ++++++ src/lib/edje_calc.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74d0790..8226be7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -322,3 +322,9 @@ * Added edje_object_markup_filter_callback_{add,del,del_full}. These let you append(delete) markup filter functions for filtering inserted text. + +2012-02-08 Cedric Bail + + * Fix bug when using EDJE_CALC_CACHE and using relative to x and y + on separate part. + diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c index 974b6dd..0484b67 100644 --- a/src/lib/edje_calc.c +++ b/src/lib/edje_calc.c @@ -2449,7 +2449,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta p1, pos); #ifdef EDJE_CALC_CACHE - ep->param1.state = ed->state; + if (flags == FLAG_XY) + ep->param1.state = ed->state; #endif } } @@ -2501,7 +2502,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta confine_to, p2, pos); #ifdef EDJE_CALC_CACHE - ep->param2->state = ed->state; + if (flags == FLAG_XY) + ep->param2->state = ed->state; #endif } -- 2.7.4