summaryrefslogtreecommitdiff
path: root/src/tests/emotion
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-05-30 10:31:19 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-06-12 00:10:04 +0300
commit6e1b5fdd1065d0a0f3b04cd07ea069f05ec4077e (patch)
tree429b8f7167a4fe23440861630171b227e5678d31 /src/tests/emotion
parent4a1b42aee86b505b511ac7326176a4e7aa190c80 (diff)
Canvas layout: port part_text to efl_part
You now use the following: efl_text_set(efl_part(edje_obj, "part"), "text"); const char *text = efl_text_get(efl_part(edje_obj, "part")); The former method of edje_object_part_text_set/get is now legacy. Also, adjusted 'tests/emotion/emotion_test_main-eo.c' with this change.
Diffstat (limited to 'src/tests/emotion')
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 528f62ccbc..0848db5fef 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -320,7 +320,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
320 320
321 snprintf(buf, sizeof(buf), "%i:%02i:%02i.%02i / %i:%02i:%02i", 321 snprintf(buf, sizeof(buf), "%i:%02i:%02i.%02i / %i:%02i:%02i",
322 ph, pm, ps, pf, lh, lm, ls); 322 ph, pm, ps, pf, lh, lm, ls);
323 edje_obj_part_text_set(edje, "video_progress_txt", buf); 323 efl_text_set(efl_part(edje, "video_progress_txt"), buf);
324} 324}
325 325
326static void 326static void
@@ -478,7 +478,7 @@ video_obj_signal_alpha_cb(void *data, Evas_Object *o, const char *emission EINA_
478 alpha = 255 * y; 478 alpha = 255 * y;
479 efl_gfx_color_set(ov, alpha, alpha, alpha, alpha); 479 efl_gfx_color_set(ov, alpha, alpha, alpha, alpha);
480 snprintf(buf, sizeof(buf), "alpha %.0f", alpha); 480 snprintf(buf, sizeof(buf), "alpha %.0f", alpha);
481 edje_obj_part_text_set(o, "video_alpha_txt", buf); 481 efl_text_set(efl_part(o, "video_alpha_txt"), buf);
482} 482}
483 483
484static void 484static void
@@ -491,7 +491,7 @@ video_obj_signal_vol_cb(void *data, Evas_Object *o, const char *emission EINA_UN
491 efl_ui_drag_value_get(efl_part(o, source), NULL, &vol); 491 efl_ui_drag_value_get(efl_part(o, source), NULL, &vol);
492 emotion_object_audio_volume_set(ov, vol); 492 emotion_object_audio_volume_set(ov, vol);
493 snprintf(buf, sizeof(buf), "vol %.2f", vol); 493 snprintf(buf, sizeof(buf), "vol %.2f", vol);
494 edje_obj_part_text_set(o, "video_volume_txt", buf); 494 efl_text_set(efl_part(o, "video_volume_txt"), buf);
495} 495}
496 496
497static void 497static void
@@ -642,9 +642,9 @@ init_video_object(const char *module_filename, const char *filename)
642 edje_obj_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe); 642 edje_obj_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe);
643 edje_obj_signal_callback_add(oe, "mouse, move", "*", video_obj_signal_frame_move_cb, oe); 643 edje_obj_signal_callback_add(oe, "mouse, move", "*", video_obj_signal_frame_move_cb, oe);
644 efl_ui_drag_value_set(efl_part(oe, "video_alpha"), 0.0, 1.0); 644 efl_ui_drag_value_set(efl_part(oe, "video_alpha"), 0.0, 1.0);
645 edje_obj_part_text_set(oe, "video_alpha_txt", "alpha 255"); 645 efl_text_set(efl_part(oe, "video_alpha_txt"), "alpha 255");
646 efl_ui_drag_value_set(efl_part(oe, "video_volume"), 0.0, 0.5); 646 efl_ui_drag_value_set(efl_part(oe, "video_volume"), 0.0, 0.5);
647 edje_obj_part_text_set(oe, "video_volume_txt", "vol 0.50"); 647 efl_text_set(efl_part(oe, "video_volume_txt"), "vol 0.50");
648 edje_obj_signal_emit(oe, "video_state", "play"); 648 edje_obj_signal_emit(oe, "video_state", "play");
649 efl_gfx_visible_set(oe, EINA_TRUE); 649 efl_gfx_visible_set(oe, EINA_TRUE);
650} 650}