diff options
author | subhransu mohanty <sub.mohanty@samsung.com> | 2017-10-23 11:05:34 -0700 |
---|---|---|
committer | Cedric Bail <cedric@osg.samsung.com> | 2017-10-23 11:05:38 -0700 |
commit | d26759555737681f454dbf80653a72dc506d355f (patch) | |
tree | 025abce62951f7808ba8dd1c8ee8ae5644221026 /src/lib/edje/edje_calc.c | |
parent | 74155b6e3424fe2cf9c6a92e0853e627ba865359 (diff) |
evas: add set function for root_node property.
Summary:
Currently user ask for the root_node from the evas_vg object and then attach its tree by setting the root node as parent.
With this change this process will be explicit. user has to set the root node to the evas_vg object and the object will take the ownership
of the tree. User can query the current vg_tree by root_node_get api.
Test Plan:
Fixed the test app to reflects this change.
Reviewers: jpeg, cedric
Reviewed By: jpeg, cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D5347
Signed-off-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r-- | src/lib/edje/edje_calc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 5a01da863f..ba5b4742dc 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c | |||
@@ -3695,7 +3695,6 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U | |||
3695 | { | 3695 | { |
3696 | int w, h; | 3696 | int w, h; |
3697 | int new_svg = -1; | 3697 | int new_svg = -1; |
3698 | Efl_VG *root_vg; | ||
3699 | Eina_Matrix3 matrix; | 3698 | Eina_Matrix3 matrix; |
3700 | Edje_Vector_Data *start, *end; | 3699 | Edje_Vector_Data *start, *end; |
3701 | 3700 | ||
@@ -3703,8 +3702,6 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U | |||
3703 | 3702 | ||
3704 | if( (w == 0) || (h == 0)) return; | 3703 | if( (w == 0) || (h == 0)) return; |
3705 | 3704 | ||
3706 | root_vg = evas_object_vg_root_node_get(ep->object); | ||
3707 | |||
3708 | if (ep->param2) | 3705 | if (ep->param2) |
3709 | { | 3706 | { |
3710 | Edje_Part_Description_Vector *next_state = (Edje_Part_Description_Vector *)ep->param2->description; | 3707 | Edje_Part_Description_Vector *next_state = (Edje_Part_Description_Vector *)ep->param2->description; |
@@ -3751,7 +3748,7 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U | |||
3751 | 3748 | ||
3752 | _edje_dupe_vector_data(ed, chosen_desc->vg.id, w, h, &ep->typedata.vector->cur); | 3749 | _edje_dupe_vector_data(ed, chosen_desc->vg.id, w, h, &ep->typedata.vector->cur); |
3753 | 3750 | ||
3754 | efl_parent_set(ep->typedata.vector->cur.vg, root_vg); | 3751 | evas_object_vg_root_node_set(ep->object, ep->typedata.vector->cur.vg); |
3755 | } | 3752 | } |
3756 | } | 3753 | } |
3757 | } | 3754 | } |