summaryrefslogtreecommitdiff
path: root/src/tests/emotion/emotion_test_main-eo.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/emotion/emotion_test_main-eo.c')
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 0f33f5a..9663ab7 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -113,7 +113,7 @@ bg_setup(void)
113{ 113{
114 o_bg = efl_add(EDJE_OBJECT_CLASS, evas); 114 o_bg = efl_add(EDJE_OBJECT_CLASS, evas);
115 efl_file_set(o_bg, theme_file, "background"); 115 efl_file_set(o_bg, theme_file, "background");
116 efl_gfx_position_set(o_bg, 0, 0); 116 efl_gfx_position_set(o_bg, EINA_POSITION2D(0, 0));
117 efl_gfx_size_set(o_bg, startw, starth); 117 efl_gfx_size_set(o_bg, startw, starth);
118 efl_gfx_stack_layer_set(o_bg, -999); 118 efl_gfx_stack_layer_set(o_bg, -999);
119 efl_gfx_visible_set(o_bg, EINA_TRUE); 119 efl_gfx_visible_set(o_bg, EINA_TRUE);
@@ -553,11 +553,14 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
553 if (!fd) return; 553 if (!fd) return;
554 if (fd->moving) 554 if (fd->moving)
555 { 555 {
556 Evas_Coord x, y, ox, oy; 556 Evas_Coord x, y;
557 Eina_Position2D pos;
557 558
558 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 559 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
559 efl_gfx_position_get(o, &ox, &oy); 560 pos = efl_gfx_position_get(o);
560 efl_gfx_position_set(o, ox + (x - fd->x), oy + (y - fd->y)); 561 pos.x += (x - fd->x);
562 pos.y += (y - fd->y);
563 efl_gfx_position_set(o, pos);
561 fd->x = x; 564 fd->x = x;
562 fd->y = y; 565 fd->y = y;
563 } 566 }
@@ -624,7 +627,7 @@ init_video_object(const char *module_filename, const char *filename)
624 edje_object_part_swallow(oe, "video_swallow", o); 627 edje_object_part_swallow(oe, "video_swallow", o);
625 628
626 offset = 20 * (eina_list_count(video_objs) - 1); 629 offset = 20 * (eina_list_count(video_objs) - 1);
627 efl_gfx_position_set(oe, offset, offset); 630 efl_gfx_position_set(oe, EINA_POSITION2D(offset, offset));
628 edje_object_size_min_calc(oe, &w, &h); 631 edje_object_size_min_calc(oe, &w, &h);
629 efl_gfx_size_set(oe, w, h); 632 efl_gfx_size_set(oe, w, h);
630 633