summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2014-11-28 13:33:09 +0900
committerChunEon Park <hermet@hermet.pe.kr>2014-11-28 13:36:20 +0900
commit9c6d1a500d7f72739f351b1383e13e80cd822ae8 (patch)
tree87338fcf2d077923424287be4e13d2b1ea1e5996
parentd7b42c17c327ffc42b278b39d1291231ac533068 (diff)
elm_transit: Apply evas_map_util_object_move_sync_set() to transit
Summary: Apply evas_map_util_object_move_sync_set() to transit to keep map transformation after object move please update efl library because evas_map_util_object_move_sync_set()'s been newly added. Reviewers: Hermet, cedric Differential Revision: https://phab.enlightenment.org/D1685
-rw-r--r--src/lib/elm_transit.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index daa7f35d0..394c77e80 100644
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -1084,6 +1084,8 @@ _transit_effect_zoom_op(Elm_Transit_Effect *effect, Elm_Transit *transit , doubl
1084 map = evas_map_new(4); 1084 map = evas_map_new(4);
1085 if (!map) return; 1085 if (!map) return;
1086 1086
1087 evas_map_util_object_move_sync_set(map, EINA_TRUE);
1088
1087 EINA_LIST_FOREACH(transit->objs, elist, obj) 1089 EINA_LIST_FOREACH(transit->objs, elist, obj)
1088 { 1090 {
1089 evas_object_geometry_get(obj, &x, &y, &w, &h); 1091 evas_object_geometry_get(obj, &x, &y, &w, &h);
@@ -1176,6 +1178,8 @@ _transit_effect_flip_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
1176 map = evas_map_new(4); 1178 map = evas_map_new(4);
1177 if (!map) return; 1179 if (!map) return;
1178 1180
1181 evas_map_util_object_move_sync_set(map, EINA_TRUE);
1182
1179 if (flip->cw) degree = (float)(progress * 180); 1183 if (flip->cw) degree = (float)(progress * 180);
1180 else degree = (float)(progress * -180); 1184 else degree = (float)(progress * -180);
1181 1185
@@ -1473,6 +1477,8 @@ _transit_effect_resizable_flip_op(Elm_Transit_Effect *effect, Elm_Transit *trans
1473 map = evas_map_new(4); 1477 map = evas_map_new(4);
1474 if (!map) return; 1478 if (!map) return;
1475 1479
1480 evas_map_util_object_move_sync_set(map, EINA_TRUE);
1481
1476 if (resizable_flip->cw) degree = (float)(progress * 180); 1482 if (resizable_flip->cw) degree = (float)(progress * 180);
1477 else degree = (float)(progress * -180); 1483 else degree = (float)(progress * -180);
1478 1484
@@ -1763,6 +1769,8 @@ _transit_effect_wipe_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
1763 map = evas_map_new(4); 1769 map = evas_map_new(4);
1764 if (!map) return; 1770 if (!map) return;
1765 1771
1772 evas_map_util_object_move_sync_set(map, EINA_TRUE);
1773
1766 EINA_LIST_FOREACH(transit->objs, elist, obj) 1774 EINA_LIST_FOREACH(transit->objs, elist, obj)
1767 { 1775 {
1768 type = evas_object_type_get(obj); 1776 type = evas_object_type_get(obj);
@@ -2288,6 +2296,8 @@ _transit_effect_rotation_op(Elm_Transit_Effect *effect, Elm_Transit *transit, do
2288 map = evas_map_new(4); 2296 map = evas_map_new(4);
2289 if (!map) return; 2297 if (!map) return;
2290 2298
2299 evas_map_util_object_move_sync_set(map, EINA_TRUE);
2300
2291 EINA_LIST_FOREACH(transit->objs, elist, obj) 2301 EINA_LIST_FOREACH(transit->objs, elist, obj)
2292 { 2302 {
2293 evas_map_util_points_populate_from_object_full(map, obj, 0); 2303 evas_map_util_points_populate_from_object_full(map, obj, 0);