enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

edje: fix the order of applying transformation when creating vg tree. 

Reviewers: cedric, jpeg

Reviewed By: jpeg

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4087
This commit is contained in:
Subhransu Mohanty 2016-06-24 15:15:54 +09:00 committed by Jean-Philippe Andre
parent 6e6c85293e
commit 48d3abf84b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/edje/edje_calc.c
View File

@ -3288,16 +3288,16 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U
sx = w/start->w;
sy = h/start->h;
eina_matrix3_identity(&matrix);
eina_matrix3_translate(&matrix, -start->x, -start->y);
eina_matrix3_scale(&matrix, sx, sy);
eina_matrix3_translate(&matrix, -start->x, -start->y);
evas_vg_node_transformation_set(start->vg, &matrix);
// for end vector
sx = w/end->w;
sy = h/end->h;
eina_matrix3_identity(&matrix);
eina_matrix3_translate(&matrix, -end->x, -end->y);
eina_matrix3_scale(&matrix, sx, sy);
eina_matrix3_translate(&matrix, -end->x, -end->y);
evas_vg_node_transformation_set(end->vg, &matrix);
// do the interpolation
@ -3320,8 +3320,8 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U
sx = w/ep->typedata.vector->cur.w;
sy = h/ep->typedata.vector->cur.h;
eina_matrix3_identity(&matrix);
eina_matrix3_translate(&matrix, -ep->typedata.vector->cur.x, -ep->typedata.vector->cur.y);
eina_matrix3_scale(&matrix, sx, sy);
eina_matrix3_translate(&matrix, -ep->typedata.vector->cur.x, -ep->typedata.vector->cur.y);
evas_vg_node_transformation_set(ep->typedata.vector->cur.vg, &matrix);
return;
}

2
src/lib/edje/edje_load.c
View File

@ -2589,8 +2589,8 @@ _edje_dupe_vector_data(Edje *ed, int svg_id, double width, double height,
sx = width/vector->w;
sy = height/vector->h;
eina_matrix3_identity(&matrix);
eina_matrix3_translate(&matrix, -vector->x, -vector->y);
eina_matrix3_scale(&matrix, sx, sy);
eina_matrix3_translate(&matrix, -vector->x, -vector->y);
evas_vg_node_transformation_set(root, &matrix);
}