summaryrefslogtreecommitdiff
path: root/src/tests/emotion
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-05 10:47:26 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:32 -0700
commit55bd097a3d5c0201c28bc0bd045cbe77aa76f5af (patch)
tree6929ab1b8bddee873305e58aed933d7039488fcf /src/tests/emotion
parent7934d152dd5c185df1b89f50239d27f25c6f2b88 (diff)
Efl.Gfx.Entity (from Efl.Gfx)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/tests/emotion')
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index b5848517cc..2d5df2f9ab 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -76,7 +76,7 @@ static const char *theme_file = NULL;
76static void 76static void
77bg_resize(Evas_Coord w, Evas_Coord h) 77bg_resize(Evas_Coord w, Evas_Coord h)
78{ 78{
79 efl_gfx_size_set(o_bg, EINA_SIZE2D(w, h)); 79 efl_gfx_entity_size_set(o_bg, EINA_SIZE2D(w, h));
80} 80}
81 81
82static void 82static void
@@ -113,10 +113,10 @@ bg_setup(void)
113{ 113{
114 o_bg = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas); 114 o_bg = efl_add(EFL_CANVAS_LAYOUT_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, EINA_POSITION2D(0, 0)); 116 efl_gfx_entity_position_set(o_bg, EINA_POSITION2D(0, 0));
117 efl_gfx_size_set(o_bg, EINA_SIZE2D(startw, starth)); 117 efl_gfx_entity_size_set(o_bg, EINA_SIZE2D(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_entity_visible_set(o_bg, EINA_TRUE);
120 evas_object_focus_set(o_bg, EINA_TRUE); 120 evas_object_focus_set(o_bg, EINA_TRUE);
121 efl_event_callback_add(o_bg, EFL_EVENT_KEY_DOWN, bg_key_down, NULL); 121 efl_event_callback_add(o_bg, EFL_EVENT_KEY_DOWN, bg_key_down, NULL);
122} 122}
@@ -354,7 +354,7 @@ video_obj_frame_resize_cb(void *data, const Efl_Event *event)
354 evas_object_size_hint_min_set(event->object, iw, ih); 354 evas_object_size_hint_min_set(event->object, iw, ih);
355 edje_object_part_swallow(oe, "video_swallow", event->object); 355 edje_object_part_swallow(oe, "video_swallow", event->object);
356 edje_object_size_min_calc(oe, &w, &h); 356 edje_object_size_min_calc(oe, &w, &h);
357 efl_gfx_size_set(oe, EINA_SIZE2D(w, h)); 357 efl_gfx_entity_size_set(oe, EINA_SIZE2D(w, h));
358 evas_object_size_hint_min_set(event->object, 0, 0); 358 evas_object_size_hint_min_set(event->object, 0, 0);
359 edje_object_part_swallow(oe, "video_swallow", event->object); 359 edje_object_part_swallow(oe, "video_swallow", event->object);
360} 360}
@@ -557,10 +557,10 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
557 Eina_Position2D pos; 557 Eina_Position2D pos;
558 558
559 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 559 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
560 pos = efl_gfx_position_get(o); 560 pos = efl_gfx_entity_position_get(o);
561 pos.x += (x - fd->x); 561 pos.x += (x - fd->x);
562 pos.y += (y - fd->y); 562 pos.y += (y - fd->y);
563 efl_gfx_position_set(o, pos); 563 efl_gfx_entity_position_set(o, pos);
564 fd->x = x; 564 fd->x = x;
565 fd->y = y; 565 fd->y = y;
566 } 566 }
@@ -570,7 +570,7 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
570 Eina_Size2D sz; 570 Eina_Size2D sz;
571 571
572 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 572 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
573 sz = efl_gfx_size_get(o); 573 sz = efl_gfx_entity_size_get(o);
574 evas_object_resize(o, sz.w + (x - fd->x), sz.h + (y - fd->y)); 574 evas_object_resize(o, sz.w + (x - fd->x), sz.h + (y - fd->y));
575 fd->x = x; 575 fd->x = x;
576 fd->y = y; 576 fd->y = y;
@@ -628,9 +628,9 @@ init_video_object(const char *module_filename, const char *filename)
628 edje_object_part_swallow(oe, "video_swallow", o); 628 edje_object_part_swallow(oe, "video_swallow", o);
629 629
630 offset = 20 * (eina_list_count(video_objs) - 1); 630 offset = 20 * (eina_list_count(video_objs) - 1);
631 efl_gfx_position_set(oe, EINA_POSITION2D(offset, offset)); 631 efl_gfx_entity_position_set(oe, EINA_POSITION2D(offset, offset));
632 edje_object_size_min_calc(oe, &w, &h); 632 edje_object_size_min_calc(oe, &w, &h);
633 efl_gfx_size_set(oe, EINA_SIZE2D(w, h)); 633 efl_gfx_entity_size_set(oe, EINA_SIZE2D(w, h));
634 634
635 efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe); 635 efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe);
636 636
@@ -650,7 +650,7 @@ init_video_object(const char *module_filename, const char *filename)
650 efl_ui_drag_value_set(efl_part(oe, "video_volume"), 0.0, 0.5); 650 efl_ui_drag_value_set(efl_part(oe, "video_volume"), 0.0, 0.5);
651 efl_text_set(efl_part(oe, "video_volume_txt"), "vol 0.50"); 651 efl_text_set(efl_part(oe, "video_volume_txt"), "vol 0.50");
652 efl_layout_signal_emit(oe, "video_state", "play"); 652 efl_layout_signal_emit(oe, "video_state", "play");
653 efl_gfx_visible_set(oe, EINA_TRUE); 653 efl_gfx_entity_visible_set(oe, EINA_TRUE);
654} 654}
655 655
656int 656int