From 48d3abf84bdf355fb62a6db745e908cbd8ded1c0 Mon Sep 17 00:00:00 2001
From: Subhransu Mohanty <sub.mohanty@samsung.com>
Date: Fri, 24 Jun 2016 15:15:54 +0900
Subject: [PATCH] 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
---
 src/lib/edje/edje_calc.c | 6 +++---
 src/lib/edje/edje_load.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 7c0e98a..2bf8204 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -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;
           }
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 8e71e9b6..facc9ae 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -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);
      }
 
-- 
2.7.4