summaryrefslogtreecommitdiff
path: root/src/tests/emotion
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-31 17:03:26 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-31 18:42:28 +0900
commitce0d15ecb330e2c63b437956a345723a8b493b7f (patch)
tree0fc62bb6f77a6e4a8ab2d2f1a8f2770fb9fc609d /src/tests/emotion
parentaa5ac8eed71fb448d05ba05f05de32c6b2f86d7b (diff)
edje: Reshuffle a bit edje_object.eo
This changes a few method names: - freeze -> calc_freeze - thaw -> calc_thaw - update_hints -> calc_update_hints Otherwise this is mostly about reshuffling the EO file itself and changing documentation. Ref T5315
Diffstat (limited to 'src/tests/emotion')
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index fd8a51319f..528f62ccbc 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -353,7 +353,7 @@ video_obj_frame_resize_cb(void *data, const Efl_Event *event)
353 if (ratio > 0.0) iw = (ih * ratio) + 0.5; 353 if (ratio > 0.0) iw = (ih * ratio) + 0.5;
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_obj_size_min_calc(oe, &w, &h); 356 edje_object_size_min_calc(oe, &w, &h);
357 efl_gfx_size_set(oe, w, h); 357 efl_gfx_size_set(oe, 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);
@@ -625,7 +625,7 @@ init_video_object(const char *module_filename, const char *filename)
625 625
626 offset = 20 * (eina_list_count(video_objs) - 1); 626 offset = 20 * (eina_list_count(video_objs) - 1);
627 efl_gfx_position_set(oe, offset, offset); 627 efl_gfx_position_set(oe, offset, offset);
628 edje_obj_size_min_calc(oe, &w, &h); 628 edje_object_size_min_calc(oe, &w, &h);
629 efl_gfx_size_set(oe, w, h); 629 efl_gfx_size_set(oe, w, h);
630 630
631 efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe); 631 efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe);