enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Efl.Gfx.Entity (from Efl.Gfx) 

Ref https://phab.enlightenment.org/T6847

Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
This commit is contained in:
Xavi Artigas 2018-04-05 10:47:26 +02:00 committed by Cedric Bail
parent 7934d152dd
commit 55bd097a3d
235 changed files with 1352 additions and 1352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Efl.am
View File

@ -1,7 +1,7 @@
# Even though libefl is new, it contains definitions used by legacy APIs # Even though libefl is new, it contains definitions used by legacy APIs
efl_eolian_legacy_files = \ efl_eolian_legacy_files = \
lib/efl/interfaces/efl_gfx_fill.eo \ lib/efl/interfaces/efl_gfx_fill.eo \
lib/efl/interfaces/efl_gfx.eo \ lib/efl/interfaces/efl_gfx_entity.eo \
lib/efl/interfaces/efl_gfx_color.eo \ lib/efl/interfaces/efl_gfx_color.eo \
lib/efl/interfaces/efl_image.eo \ lib/efl/interfaces/efl_image.eo \
lib/efl/interfaces/efl_image_animated.eo \ lib/efl/interfaces/efl_image_animated.eo \

4
src/bin/elementary/test_bg.c
View File

@ -367,7 +367,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win),
efl_pack(box, efl_added)); efl_pack(box, efl_added));
efl_gfx_size_set(win, EINA_SIZE2D(300, 200)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
} }
static void static void
@ -479,7 +479,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg), efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg),
efl_pack(hbox, efl_added)); efl_pack(hbox, efl_added));
efl_gfx_size_set(win, EINA_SIZE2D(300, 200)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
} }

2
src/bin/elementary/test_box.c
View File

@ -919,5 +919,5 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_file_set(efl_added, buf, NULL)); efl_file_set(efl_added, buf, NULL));
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_size_set(win, EINA_SIZE2D(300, 300)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 300));
} }

2
src/bin/elementary/test_calendar.c
View File

@ -454,5 +454,5 @@ test_efl_ui_calendar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_format_cb_set(efl_added, NULL, _cal_format_cb, NULL), efl_ui_format_cb_set(efl_added, NULL, _cal_format_cb, NULL),
efl_pack(box, efl_added)); efl_pack(box, efl_added));
efl_gfx_size_set(win, EINA_SIZE2D(300, 300)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 300));
} }

4
src/bin/elementary/test_efl_anim_event_anim.c
View File

@ -61,7 +61,7 @@ test_efl_anim_event_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
efl_animation_alpha_set(show_anim, 0.0, 1.0); efl_animation_alpha_set(show_anim, 0.0, 1.0);
efl_animation_duration_set(show_anim, 1.0); efl_animation_duration_set(show_anim, 1.0);
efl_animation_final_state_keep_set(show_anim, EINA_TRUE); efl_animation_final_state_keep_set(show_anim, EINA_TRUE);
efl_canvas_object_event_animation_set(btn, EFL_GFX_EVENT_SHOW, show_anim); efl_canvas_object_event_animation_set(btn, EFL_GFX_ENTITY_EVENT_SHOW, show_anim);
//Show button after setting event animation to show animation for show event //Show button after setting event animation to show animation for show event
evas_object_show(btn); evas_object_show(btn);
@ -71,7 +71,7 @@ test_efl_anim_event_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
efl_animation_alpha_set(hide_anim, 1.0, 0.0); efl_animation_alpha_set(hide_anim, 1.0, 0.0);
efl_animation_duration_set(hide_anim, 1.0); efl_animation_duration_set(hide_anim, 1.0);
efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); efl_animation_final_state_keep_set(hide_anim, EINA_TRUE);
efl_canvas_object_event_animation_set(btn, EFL_GFX_EVENT_HIDE, hide_anim); efl_canvas_object_event_animation_set(btn, EFL_GFX_ENTITY_EVENT_HIDE, hide_anim);
//Initialize App Data //Initialize App Data
ad->target = btn; ad->target = btn;

2
src/bin/elementary/test_efl_gfx_map.c
View File

@ -61,5 +61,5 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
_map_set(img); _map_set(img);
efl_content_set(win, img); efl_content_set(win, img);
efl_gfx_size_set(win, EINA_SIZE2D(W, H)); efl_gfx_entity_size_set(win, EINA_SIZE2D(W, H));
} }

4
src/bin/elementary/test_evas_map.c
View File

@ -41,7 +41,7 @@ _image_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
{ {
Eina_Size2D sz; Eina_Size2D sz;
sz = efl_gfx_size_get(obj); sz = efl_gfx_entity_size_get(obj);
_map_set(obj, sz.w, sz.h); _map_set(obj, sz.w, sz.h);
} }
@ -69,5 +69,5 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
_map_set(img, W, H); _map_set(img, W, H);
efl_content_set(win, img); efl_content_set(win, img);
efl_gfx_size_set(win, EINA_SIZE2D(W, H)); efl_gfx_entity_size_set(win, EINA_SIZE2D(W, H));
} }

2
src/bin/elementary/test_evas_mask.c
View File

@ -176,5 +176,5 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added)); efl_pack(box2, efl_added));
efl_gfx_size_set(win, EINA_SIZE2D(500, 600)); efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600));
} }

2
src/bin/elementary/test_evas_snapshot.c
View File

@ -204,5 +204,5 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_key_wref_set(win, "snap", snap); efl_key_wref_set(win, "snap", snap);
efl_key_wref_set(win, "table", table); efl_key_wref_set(win, "table", table);
efl_gfx_size_set(win, EINA_SIZE2D(400, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 400));
} }

2
src/bin/elementary/test_events.c
View File

@ -120,7 +120,7 @@ _clicked_button2(void *data, const Efl_Event *ev EINA_UNUSED)
if (!td->evkeyup) if (!td->evkeyup)
{ {
r = efl_gfx_geometry_get(bt); r = efl_gfx_entity_geometry_get(bt);
r.x = r.x + r.w / 2; r.x = r.x + r.w / 2;
r.y = r.y + r.h / 2; r.y = r.y + r.h / 2;

2
src/bin/elementary/test_flip_page_eo.c
View File

@ -134,7 +134,7 @@ _slice_3d(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coo
efl_gfx_map_coord_absolute_get(sl->obj, i, &xx, &yy, NULL); efl_gfx_map_coord_absolute_get(sl->obj, i, &xx, &yy, NULL);
efl_gfx_map_coord_absolute_set(sl->obj, i, xx, yy, 0); efl_gfx_map_coord_absolute_set(sl->obj, i, xx, yy, 0);
} }
efl_gfx_visible_set(sl->obj, efl_gfx_map_clockwise_get(sl->obj)); efl_gfx_entity_visible_set(sl->obj, efl_gfx_map_clockwise_get(sl->obj));
} }
static void static void

16
src/bin/elementary/test_gfx_filters.c
View File

@ -247,7 +247,7 @@ _text_resize(void *data EINA_UNUSED, const Efl_Event *ev)
{ {
Eina_Size2D sz; Eina_Size2D sz;
sz = efl_gfx_size_get(ev->object); sz = efl_gfx_entity_size_get(ev->object);
efl_gfx_size_hint_min_set(ev->object, sz); efl_gfx_size_hint_min_set(ev->object, sz);
} }
@ -459,11 +459,11 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
// Note: No TEXT object with EO APIs // Note: No TEXT object with EO APIs
o = text = evas_object_text_add(evas_object_evas_get(win)); o = text = evas_object_text_add(evas_object_evas_get(win));
efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL); efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _text_resize, NULL);
efl_text_font_set(o, "Sans:style=Bold", default_font_size); efl_text_font_set(o, "Sans:style=Bold", default_font_size);
efl_gfx_scale_set(text, elm_config_scale_get()); efl_gfx_entity_scale_set(text, elm_config_scale_get());
efl_text_set(o, "EFL"); efl_text_text_set(o, "EFL");
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
efl_pack(box2, o); efl_pack(box2, o);
o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win,
@ -491,7 +491,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
// Experimental textblock support // Experimental textblock support
o = tb = evas_object_textblock_add(evas_object_evas_get(win)); o = tb = evas_object_textblock_add(evas_object_evas_get(win));
efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL); efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _textblock_resize, NULL); efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _textblock_resize, NULL);
Evas_Textblock_Style *st = evas_textblock_style_new(); Evas_Textblock_Style *st = evas_textblock_style_new();
evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'"); evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++) for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++)
@ -500,7 +500,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, prg_data[k].exec); efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, prg_data[k].exec);
evas_object_textblock_style_set(o, st); evas_object_textblock_style_set(o, st);
evas_object_textblock_text_markup_set(o, tbtxt); evas_object_textblock_text_markup_set(o, tbtxt);
efl_gfx_scale_set(o, elm_config_scale_get()); efl_gfx_entity_scale_set(o, elm_config_scale_get());
efl_pack(box2, o); efl_pack(box2, o);
evas_object_resize(o, 1, 1); evas_object_resize(o, 1, 1);
} }
@ -534,5 +534,5 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
elm_spinner_value_set(spinner, 1.0); elm_spinner_value_set(spinner, 1.0);
_spinner_cb(win, spinner, NULL); _spinner_cb(win, spinner, NULL);
efl_gfx_size_set(win, EINA_SIZE2D(500, 600)); efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600));
} }

2
src/bin/elementary/test_nstate.c
View File

@ -29,5 +29,5 @@ test_nstate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_text_set(nstate, "nstate = 0"); efl_text_set(nstate, "nstate = 0");
efl_pack(bx, nstate); efl_pack(bx, nstate);
efl_gfx_size_set(win, EINA_SIZE2D(120, 80)); efl_gfx_entity_size_set(win, EINA_SIZE2D(120, 80));
} }

2
src/bin/elementary/test_part_bg.c
View File

@ -181,5 +181,5 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group); efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group);
efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group); efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group);
efl_gfx_size_set(win, EINA_SIZE2D(300, 200)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
} }

2
src/bin/elementary/test_part_shadow.c
View File

@ -190,5 +190,5 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_pack(bt_bx, bt); efl_pack(bt_bx, bt);
td->btn_stop = bt; td->btn_stop = bt;
efl_gfx_size_set(win, EINA_SIZE2D(240, 320)); efl_gfx_entity_size_set(win, EINA_SIZE2D(240, 320));
} }

12
src/bin/elementary/test_photocam.c
View File

@ -765,9 +765,9 @@ _zoomable_move_resize_cb(void *data, const Efl_Event *ev)
{ {
Eina_Rect r; Eina_Rect r;
r = efl_gfx_geometry_get(ev->object); r = efl_gfx_entity_geometry_get(ev->object);
efl_gfx_size_set(data, EINA_SIZE2D(r.w, r.h)); efl_gfx_entity_size_set(data, EINA_SIZE2D(r.w, r.h));
efl_gfx_position_set(data, r.pos); efl_gfx_entity_position_set(data, r.pos);
} }
static void static void
@ -842,8 +842,8 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
); );
// add move/resize callbacks to resize rect manually // add move/resize callbacks to resize rect manually
efl_event_callback_add(zoomable, EFL_GFX_EVENT_RESIZE, _zoomable_move_resize_cb, rect); efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_RESIZE, _zoomable_move_resize_cb, rect);
efl_event_callback_add(zoomable, EFL_GFX_EVENT_MOVE, _zoomable_move_resize_cb, rect); efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_MOVE, _zoomable_move_resize_cb, rect);
efl_gfx_size_set(win, EINA_SIZE2D(300, 320)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320));
} }

4
src/bin/elementary/test_scroller.c
View File

@ -494,8 +494,8 @@ _bounce_cb(void *data)
if (!bounce->y1) if (!bounce->y1)
{ {
elm_interface_scrollable_bounce_allow_set(bounce->scroller, 0, 1); elm_interface_scrollable_bounce_allow_set(bounce->scroller, 0, 1);
bounce->y1 = efl_gfx_position_get(bounce->it1).y; bounce->y1 = efl_gfx_entity_position_get(bounce->it1).y;
bounce->y2 = efl_gfx_position_get(bounce->it2).y; bounce->y2 = efl_gfx_entity_position_get(bounce->it2).y;
} }
bounce->state++; bounce->state++;

72
src/bin/elementary/test_ui_box.c
View File

@ -178,7 +178,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
if (!count) return; if (!count) return;
rp = efl_gfx_geometry_get(pack); rp = efl_gfx_entity_geometry_get(pack);
EINA_ITERATOR_FOREACH(it, sobj) EINA_ITERATOR_FOREACH(it, sobj)
{ {
Eina_Rect r; Eina_Rect r;
@ -186,7 +186,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
r.x = (rp.w / count) * i; r.x = (rp.w / count) * i;
r.y = (rp.h / count) * i; r.y = (rp.h / count) * i;
r.size = efl_gfx_size_hint_combined_min_get(sobj); r.size = efl_gfx_size_hint_combined_min_get(sobj);
efl_gfx_geometry_set(sobj, r); efl_gfx_entity_geometry_set(sobj, r);
i++; i++;
} }
eina_iterator_free(it); eina_iterator_free(it);
@ -219,7 +219,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
win = elm_win_util_standard_add("ui-box", "Efl.Ui.Box"); win = elm_win_util_standard_add("ui-box", "Efl.Ui.Box");
elm_win_autodel_set(win, EINA_TRUE); elm_win_autodel_set(win, EINA_TRUE);
efl_gfx_size_set(win, EINA_SIZE2D(600, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
vbox = efl_add(EFL_UI_BOX_CLASS, win, vbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
@ -234,7 +234,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(f, -1, -1); efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 0); efl_gfx_size_hint_weight_set(f, 1, 0);
efl_pack(vbox, f); efl_pack(vbox, f);
efl_gfx_visible_set(f, 1); efl_gfx_entity_visible_set(f, 1);
hbox = efl_add(EFL_UI_BOX_CLASS, win, hbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@ -254,7 +254,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(o, 0, 0.5); efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, NONE); elm_radio_state_value_set(o, NONE);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "No weight + box fill"); elm_object_text_set(o, "No weight + box fill");
@ -263,7 +263,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_radio_state_value_set(o, NONE_BUT_FILL); elm_radio_state_value_set(o, NONE_BUT_FILL);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "Equal weights"); elm_object_text_set(o, "Equal weights");
@ -272,7 +272,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_radio_state_value_set(o, EQUAL); elm_radio_state_value_set(o, EQUAL);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "One weight only"); elm_object_text_set(o, "One weight only");
@ -281,7 +281,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_radio_state_value_set(o, ONE); elm_radio_state_value_set(o, ONE);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "Two weights"); elm_object_text_set(o, "Two weights");
@ -290,7 +290,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_radio_state_value_set(o, TWO); elm_radio_state_value_set(o, TWO);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
elm_radio_value_set(chk, NONE); elm_radio_value_set(chk, NONE);
@ -305,7 +305,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "Misc"); elm_object_text_set(o, "Misc");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win); o = elm_check_add(win);
elm_check_selected_set(o, 0); elm_check_selected_set(o, 0);
@ -313,7 +313,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win);
efl_gfx_size_hint_align_set(o, 0, 0); efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win); o = elm_check_add(win);
elm_check_selected_set(o, 1); elm_check_selected_set(o, 1);
@ -321,7 +321,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win);
efl_gfx_size_hint_align_set(o, 0, 0); efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win); o = elm_check_add(win);
elm_check_selected_set(o, 0); elm_check_selected_set(o, 0);
@ -329,7 +329,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win);
efl_gfx_size_hint_align_set(o, 0, 0); efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win); o = elm_check_add(win);
elm_check_selected_set(o, 0); elm_check_selected_set(o, 0);
@ -337,7 +337,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win); efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win);
efl_gfx_size_hint_align_set(o, 0, 0); efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win); o = elm_check_add(win);
elm_check_selected_set(o, 0); elm_check_selected_set(o, 0);
@ -346,7 +346,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(o, 0, 0); efl_gfx_size_hint_align_set(o, 0, 0);
efl_gfx_size_hint_weight_set(o, 0, 1); efl_gfx_size_hint_weight_set(o, 0, 1);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* user min size setter */ /* user min size setter */
@ -359,7 +359,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "User min size"); elm_object_text_set(o, "User min size");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_format_set(o, "%.0fpx");
@ -372,7 +372,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0); elm_slider_value_set(o, 0);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* inner box padding */ /* inner box padding */
@ -385,7 +385,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "Padding"); elm_object_text_set(o, "Padding");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_format_set(o, "%.0fpx");
@ -398,7 +398,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10); elm_slider_value_set(o, 10);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* outer margin */ /* outer margin */
@ -411,7 +411,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "Margin"); elm_object_text_set(o, "Margin");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_format_set(o, "%.0fpx");
@ -424,7 +424,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10); elm_slider_value_set(o, 10);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* Box align */ /* Box align */
@ -437,7 +437,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "Box align"); elm_object_text_set(o, "Box align");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.1f"); elm_slider_indicator_format_set(o, "%.1f");
@ -450,7 +450,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_step_set(o, 0.1); elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5); elm_slider_value_set(o, 0.5);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.1f"); elm_slider_indicator_format_set(o, "%.1f");
@ -464,7 +464,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_step_set(o, 0.1); elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5); elm_slider_value_set(o, 0.5);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* contents */ /* contents */
@ -473,7 +473,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(f, -1, -1); efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 1); efl_gfx_size_hint_weight_set(f, 1, 1);
efl_pack(vbox, f); efl_pack(vbox, f);
efl_gfx_visible_set(f, 1); efl_gfx_entity_visible_set(f, 1);
bx = efl_add(EFL_UI_BOX_CLASS, win, bx = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@ -486,65 +486,65 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Btn1"); elm_object_text_set(o, "Btn1");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 2"); elm_object_text_set(o, "Button 2");
efl_gfx_size_hint_align_set(o, -1, -1); efl_gfx_size_hint_align_set(o, -1, -1);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_label_add(win); objects[i++] = o = elm_label_add(win);
elm_label_line_wrap_set(o, ELM_WRAP_WORD); elm_label_line_wrap_set(o, ELM_WRAP_WORD);
elm_object_text_set(o, "This label is not marked as fill"); elm_object_text_set(o, "This label is not marked as fill");
efl_gfx_size_hint_align_set(o, 0.5, 0.5); efl_gfx_size_hint_align_set(o, 0.5, 0.5);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Min size"); elm_object_text_set(o, "Min size");
efl_gfx_size_hint_align_set(o, 0.5, 1.0); efl_gfx_size_hint_align_set(o, 0.5, 1.0);
efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1)); efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1));
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Quit!"); elm_object_text_set(o, "Quit!");
efl_gfx_size_hint_align_set(o, 0.5, 0.0); efl_gfx_size_hint_align_set(o, 0.5, 0.0);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_label_add(win); objects[i++] = o = elm_label_add(win);
elm_label_line_wrap_set(o, ELM_WRAP_WORD); elm_label_line_wrap_set(o, ELM_WRAP_WORD);
elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill."); elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill.");
efl_gfx_size_hint_align_set(o, -1, -1); efl_gfx_size_hint_align_set(o, -1, -1);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button with a quite long text."); elm_object_text_set(o, "Button with a quite long text.");
efl_gfx_size_hint_align_set(o, -1, -1); efl_gfx_size_hint_align_set(o, -1, -1);
efl_gfx_size_hint_max_set(o, EINA_SIZE2D(200, 100)); efl_gfx_size_hint_max_set(o, EINA_SIZE2D(200, 100));
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "BtnA"); elm_object_text_set(o, "BtnA");
efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2)); efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2));
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "BtnB"); elm_object_text_set(o, "BtnB");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "BtnC"); elm_object_text_set(o, "BtnC");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
assert(i == CNT); assert(i == CNT);
efl_gfx_visible_set(win, 1); efl_gfx_entity_visible_set(win, 1);
} }

2
src/bin/elementary/test_ui_button.c
View File

@ -73,6 +73,6 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_content_set(btn, efl_added) efl_content_set(btn, efl_added)
); );
efl_gfx_size_set(win, EINA_SIZE2D(320, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
} }

2
src/bin/elementary/test_ui_panes.c
View File

@ -42,6 +42,6 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_content_set(efl_part(panes_h, "second"), efl_added) efl_content_set(efl_part(panes_h, "second"), efl_added)
); );
efl_gfx_size_set(win, EINA_SIZE2D(320, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
} }

158
src/bin/elementary/test_ui_popup.c
View File

@ -50,7 +50,7 @@ _create_popup(efl_ui_popup_data *p_data)
if (p_data->efl_ui_popup) if (p_data->efl_ui_popup)
{ {
printf("Efl.Ui.Popup is already created.\n"); printf("Efl.Ui.Popup is already created.\n");
efl_gfx_visible_set(p_data->efl_ui_popup, EINA_TRUE); efl_gfx_entity_visible_set(p_data->efl_ui_popup, EINA_TRUE);
return p_data->efl_ui_popup; return p_data->efl_ui_popup;
} }
@ -124,14 +124,14 @@ _dummy_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{ {
efl_ui_popup_data *p_data = data; efl_ui_popup_data *p_data = data;
if (!p_data->efl_ui_popup) return; if (!p_data->efl_ui_popup) return;
if (!efl_gfx_visible_get(p_data->button)) if (!efl_gfx_entity_visible_get(p_data->button))
{ {
efl_gfx_visible_set(p_data->button, EINA_TRUE); efl_gfx_entity_visible_set(p_data->button, EINA_TRUE);
efl_text_set(ev->object, "Hide Dummy Button"); efl_text_set(ev->object, "Hide Dummy Button");
} }
else else
{ {
efl_gfx_visible_set(p_data->button, EINA_FALSE); efl_gfx_entity_visible_set(p_data->button, EINA_FALSE);
efl_text_set(ev->object, "Show Dummy Button"); efl_text_set(ev->object, "Show Dummy Button");
} }
} }
@ -181,7 +181,7 @@ _position_set_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{ {
efl_ui_popup_data *p_data = data; efl_ui_popup_data *p_data = data;
if (!p_data->efl_ui_popup) return; if (!p_data->efl_ui_popup) return;
efl_gfx_position_set(p_data->efl_ui_popup, EINA_POSITION2D(0, 0)); efl_gfx_entity_position_set(p_data->efl_ui_popup, EINA_POSITION2D(0, 0));
} }
static void static void
@ -237,21 +237,21 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data); efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
efl_gfx_size_set(win, EINA_SIZE2D(500, 500)); efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
Eo *panel_win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), Eo *panel_win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Popup Panel"), efl_text_set(efl_added, "Efl.Ui.Popup Panel"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data); efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data);
efl_gfx_size_set(panel_win, EINA_SIZE2D(300, 500)); efl_gfx_entity_size_set(panel_win, EINA_SIZE2D(300, 500));
Eo *repeat_test_btn = efl_add(EFL_UI_BUTTON_CLASS, win); Eo *repeat_test_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_gfx_position_set(repeat_test_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_position_set(repeat_test_btn, EINA_POSITION2D(0, 0));
efl_gfx_size_set(repeat_test_btn, EINA_SIZE2D(100, 100)); efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100));
efl_text_set(repeat_test_btn, "Repeat Event Test"); efl_text_set(repeat_test_btn, "Repeat Event Test");
efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL); efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL);
efl_gfx_visible_set(repeat_test_btn, EINA_FALSE); efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE);
p_data->win = win; p_data->win = win;
p_data->panel_win = panel_win; p_data->panel_win = panel_win;
@ -260,74 +260,74 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(create_btn, "Create Popup"); efl_text_set(create_btn, "Create Popup");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_size_set(create_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data);
Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(delete_btn, "Delete Popup"); efl_text_set(delete_btn, "Delete Popup");
efl_gfx_position_set(delete_btn, EINA_POSITION2D(150, 0)); efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0));
efl_gfx_size_set(delete_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data); efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data);
Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(repeat_event_btn, "Repeat Event Set"); efl_text_set(repeat_event_btn, "Repeat Event Set");
efl_gfx_position_set(repeat_event_btn, EINA_POSITION2D(0, 50)); efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50));
efl_gfx_size_set(repeat_event_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(repeat_event_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data); efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data);
Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(dummy_btn, "Show Dummy Button"); efl_text_set(dummy_btn, "Show Dummy Button");
efl_gfx_position_set(dummy_btn, EINA_POSITION2D(150, 50)); efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50));
efl_gfx_size_set(dummy_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data); efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data);
Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_gfx_position_set(backwall_btn, EINA_POSITION2D(0, 100)); efl_gfx_entity_position_set(backwall_btn, EINA_POSITION2D(0, 100));
efl_gfx_size_set(backwall_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50));
efl_text_set(backwall_btn, "Backwall Set"); efl_text_set(backwall_btn, "Backwall Set");
efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data); efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data);
Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(timeout_btn, "Timeout Set"); efl_text_set(timeout_btn, "Timeout Set");
efl_gfx_position_set(timeout_btn, EINA_POSITION2D(150, 100)); efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100));
efl_gfx_size_set(timeout_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data); efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data);
Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(center_btn, "Center Align"); efl_text_set(center_btn, "Center Align");
efl_gfx_position_set(center_btn, EINA_POSITION2D(0, 150)); efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150));
efl_gfx_size_set(center_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data);
Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(top_btn, "Top Align"); efl_text_set(top_btn, "Top Align");
efl_gfx_position_set(top_btn, EINA_POSITION2D(150, 150)); efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150));
efl_gfx_size_set(top_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data);
Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(left_btn, "Left Align"); efl_text_set(left_btn, "Left Align");
efl_gfx_position_set(left_btn, EINA_POSITION2D(0, 200)); efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200));
efl_gfx_size_set(left_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data);
Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(right_btn, "Right Align"); efl_text_set(right_btn, "Right Align");
efl_gfx_position_set(right_btn, EINA_POSITION2D(150, 200)); efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200));
efl_gfx_size_set(right_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data);
Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(bottom_btn, "Bottom Align"); efl_text_set(bottom_btn, "Bottom Align");
efl_gfx_position_set(bottom_btn, EINA_POSITION2D(0, 250)); efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250));
efl_gfx_size_set(bottom_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data);
Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(position_btn, "Position Set (x:0, y:0)"); efl_text_set(position_btn, "Position Set (x:0, y:0)");
efl_gfx_position_set(position_btn, EINA_POSITION2D(150, 250)); efl_gfx_entity_position_set(position_btn, EINA_POSITION2D(150, 250));
efl_gfx_size_set(position_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data);
} }
@ -355,13 +355,13 @@ test_ui_popup_alert(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
efl_text_set(efl_added, "Efl.Ui.Popup.Alert"), efl_text_set(efl_added, "Efl.Ui.Popup.Alert"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_size_set(win, EINA_SIZE2D(320, 320)); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 320));
Eo *efl_ui_popup = efl_add(EFL_UI_POPUP_ALERT_CLASS, win); Eo *efl_ui_popup = efl_add(EFL_UI_POPUP_ALERT_CLASS, win);
efl_text_set(efl_part(efl_ui_popup, "title"), "title"); efl_text_set(efl_part(efl_ui_popup, "title"), "title");
efl_gfx_size_set(efl_ui_popup, EINA_SIZE2D(160, 160)); efl_gfx_entity_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup); Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup);
snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
@ -510,36 +510,36 @@ test_ui_popup_alert_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"), efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_size_set(win, EINA_SIZE2D(500, 500)); efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)"); efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)"); efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 50)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)"); efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 100)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)"); efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 150)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)"); efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 200)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win);
} }
@ -893,90 +893,90 @@ test_ui_popup_alert_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"), efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_size_set(win, EINA_SIZE2D(500, 700)); efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 700));
Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)"); efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)"); efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 50)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)"); efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 100)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)"); efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 150)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)"); efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 200)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)"); efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 250)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 250));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)"); efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 300)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 300));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)"); efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 350)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 350));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)"); efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 400)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 400));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)"); efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 450)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 450));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)"); efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 500)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 500));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)"); efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 550)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 550));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)"); efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 600)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 600));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)"); efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)");
efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 650)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 650));
efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win); efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win);
} }
@ -1004,7 +1004,7 @@ test_ui_popup_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data); efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
efl_gfx_size_set(win, EINA_SIZE2D(500, 500)); efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
@ -1023,8 +1023,8 @@ test_ui_popup_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
EFL_UI_POPUP_ALIGN_RIGHT, EFL_UI_POPUP_ALIGN_RIGHT,
EFL_UI_POPUP_ALIGN_CENTER); EFL_UI_POPUP_ALIGN_CENTER);
efl_gfx_position_set(efl_ui_popup, EINA_POSITION2D(80, 80)); efl_gfx_entity_position_set(efl_ui_popup, EINA_POSITION2D(80, 80));
efl_gfx_size_set(efl_ui_popup, EINA_SIZE2D(160, 120)); efl_gfx_entity_size_set(efl_ui_popup, EINA_SIZE2D(160, 120));
p_data->win = win; p_data->win = win;
p_data->efl_ui_popup = efl_ui_popup; p_data->efl_ui_popup = efl_ui_popup;

2
src/bin/elementary/test_ui_scroller.c
View File

@ -32,7 +32,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller"), efl_text_set(efl_added, "Efl Ui Scroller"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_size_set(win, EINA_SIZE2D(320, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
sc = efl_add(EFL_UI_SCROLLER_CLASS, win, sc = efl_add(EFL_UI_SCROLLER_CLASS, win,
efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),

2
src/bin/elementary/test_ui_spin.c
View File

@ -65,5 +65,5 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp),
efl_pack(bx, efl_added)); efl_pack(bx, efl_added));
efl_gfx_size_set(win, EINA_SIZE2D(100, 80)); efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 80));
} }

2
src/bin/elementary/test_ui_spin_button.c
View File

@ -39,5 +39,5 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
efl_ui_spin_button_editable_set(efl_added, EINA_FALSE), efl_ui_spin_button_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added)); efl_pack(bx, efl_added));
efl_gfx_size_set(win, EINA_SIZE2D(180, 100)); efl_gfx_entity_size_set(win, EINA_SIZE2D(180, 100));
} }

6
src/bin/elementary/test_ui_stack.c
View File

@ -60,7 +60,7 @@ _navigation_layout_create(Eo *stack, const char *text, Eo *content)
Eo *bn = efl_add(EFL_UI_NAVIGATION_BAR_CLASS, nl); Eo *bn = efl_add(EFL_UI_NAVIGATION_BAR_CLASS, nl);
efl_text_set(bn, text); efl_text_set(bn, text);
efl_gfx_visible_set(efl_part(bn, "back_button"), EINA_TRUE); efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_TRUE);
efl_ui_navigation_layout_bar_set(nl, bn); efl_ui_navigation_layout_bar_set(nl, bn);
efl_content_set(nl, content); efl_content_set(nl, content);
@ -82,7 +82,7 @@ _bar_left_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data)
efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data); efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data);
//Positions of "left_content" and "back_button" are the same. //Positions of "left_content" and "back_button" are the same.
efl_gfx_visible_set(efl_part(bn, "back_button"), EINA_FALSE); efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_FALSE);
} }
static void static void
@ -211,7 +211,7 @@ test_ui_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_text_set(efl_added, "Efl.Ui.Stack"), efl_text_set(efl_added, "Efl.Ui.Stack"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_size_set(win, EINA_SIZE2D(500, 500)); efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
Eo *stack = efl_add(EFL_UI_STACK_CLASS, win); Eo *stack = efl_add(EFL_UI_STACK_CLASS, win);
efl_event_callback_add(stack, EFL_UI_STACK_EVENT_LOADED, efl_event_callback_add(stack, EFL_UI_STACK_EVENT_LOADED,

96
src/bin/elementary/test_ui_table.c
View File

@ -113,7 +113,7 @@ static void
child_evt_cb(void *data, const Efl_Event *event) child_evt_cb(void *data, const Efl_Event *event)
{ {
Elm_Label *o = data; Elm_Label *o = data;
Efl_Gfx *it = event->info; Efl_Gfx_Entity *it = event->info;
int col, row, colspan, rowspan; int col, row, colspan, rowspan;
char buf[64]; char buf[64];
@ -139,7 +139,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED)
Eina_Rect g; Eina_Rect g;
Eo *item; Eo *item;
g = efl_gfx_geometry_get(pack); g = efl_gfx_entity_geometry_get(pack);
efl_pack_table_size_get(pack, &cols, &rows); efl_pack_table_size_get(pack, &cols, &rows);
if (!cols || !rows) goto end; if (!cols || !rows) goto end;
@ -154,7 +154,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED)
m.x = g.x + c * g.w / cols + (cs * g.w / cols - g.x) / 2; m.x = g.x + c * g.w / cols + (cs * g.w / cols - g.x) / 2;
m.y = g.y + r * g.h / rows + (rs * g.h / rows - g.y) / 2; m.y = g.y + r * g.h / rows + (rs * g.h / rows - g.y) / 2;
m.size = efl_gfx_size_hint_combined_min_get(item); m.size = efl_gfx_size_hint_combined_min_get(item);
efl_gfx_geometry_set(item, m); efl_gfx_entity_geometry_set(item, m);
gmw = MAX(gmw, m.w); gmw = MAX(gmw, m.w);
gmh = MAX(gmh, m.h); gmh = MAX(gmh, m.h);
@ -174,7 +174,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
win = elm_win_util_standard_add("ui-table", "Efl.Ui.Table"); win = elm_win_util_standard_add("ui-table", "Efl.Ui.Table");
elm_win_autodel_set(win, EINA_TRUE); elm_win_autodel_set(win, EINA_TRUE);
efl_gfx_size_set(win, EINA_SIZE2D(600, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
vbox = efl_add(EFL_UI_BOX_CLASS, win, vbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
@ -194,7 +194,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_align_set(f, -1, -1); efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 0); efl_gfx_size_hint_weight_set(f, 1, 0);
efl_pack(vbox, f); efl_pack(vbox, f);
efl_gfx_visible_set(f, 1); efl_gfx_entity_visible_set(f, 1);
hbox = efl_add(EFL_UI_BOX_CLASS, win, hbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@ -214,7 +214,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_align_set(o, 0, 0.5); efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, NONE); elm_radio_state_value_set(o, NONE);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "No weight + table fill"); elm_object_text_set(o, "No weight + table fill");
@ -223,7 +223,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, NONE_BUT_FILL); elm_radio_state_value_set(o, NONE_BUT_FILL);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "Equal weights"); elm_object_text_set(o, "Equal weights");
@ -232,7 +232,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, EQUAL); elm_radio_state_value_set(o, EQUAL);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "One weight only"); elm_object_text_set(o, "One weight only");
@ -241,7 +241,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, ONE); elm_radio_state_value_set(o, ONE);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "Two weights"); elm_object_text_set(o, "Two weights");
@ -250,7 +250,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, TWO); elm_radio_state_value_set(o, TWO);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win); o = elm_radio_add(win);
elm_object_text_set(o, "Custom layout"); elm_object_text_set(o, "Custom layout");
@ -259,7 +259,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, CUSTOM); elm_radio_state_value_set(o, CUSTOM);
elm_radio_group_add(o, chk); elm_radio_group_add(o, chk);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
elm_radio_value_set(chk, EQUAL); elm_radio_value_set(chk, EQUAL);
@ -274,7 +274,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "User min size"); elm_object_text_set(o, "User min size");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_format_set(o, "%.0fpx");
@ -287,7 +287,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0); elm_slider_value_set(o, 0);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* inner box padding */ /* inner box padding */
@ -300,7 +300,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "Padding"); elm_object_text_set(o, "Padding");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_format_set(o, "%.0fpx");
@ -313,7 +313,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10); elm_slider_value_set(o, 10);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* outer margin */ /* outer margin */
@ -326,7 +326,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "Margin"); elm_object_text_set(o, "Margin");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_format_set(o, "%.0fpx");
@ -339,7 +339,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10); elm_slider_value_set(o, 10);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* button margins */ /* button margins */
@ -352,7 +352,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "Buttons margins"); elm_object_text_set(o, "Buttons margins");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win); o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx"); elm_slider_indicator_format_set(o, "%.0fpx");
@ -365,7 +365,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10); elm_slider_value_set(o, 10);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* ro info */ /* ro info */
@ -378,12 +378,12 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "<b>Properties</>"); elm_object_text_set(o, "<b>Properties</>");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(win); o = elm_label_add(win);
efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o); efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(win); o = elm_label_add(win);
efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
@ -391,7 +391,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_align_set(o, 0.5, 0); efl_gfx_size_hint_align_set(o, 0.5, 0);
efl_gfx_size_hint_weight_set(o, 1, 1); efl_gfx_size_hint_weight_set(o, 1, 1);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* contents */ /* contents */
@ -400,11 +400,11 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_align_set(f, -1, -1); efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 1); efl_gfx_size_hint_weight_set(f, 1, 1);
efl_pack(vbox, f); efl_pack(vbox, f);
efl_gfx_visible_set(f, 1); efl_gfx_entity_visible_set(f, 1);
efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_content_set(f, table); elm_object_content_set(f, table);
efl_gfx_visible_set(table, 1); efl_gfx_entity_visible_set(table, 1);
objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_size_hint_min_set(o, EINA_SIZE2D(10, 10)); efl_gfx_size_hint_min_set(o, EINA_SIZE2D(10, 10));
@ -416,44 +416,44 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 0, 0, 1, 1); efl_pack_table(table, o, 0, 0, 1, 1);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 2"); elm_object_text_set(o, "Button 2");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 1, 0, 1, 1); efl_pack_table(table, o, 1, 0, 1, 1);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 3"); elm_object_text_set(o, "Button 3");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 2, 0, 1, 1); efl_pack_table(table, o, 2, 0, 1, 1);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 4"); elm_object_text_set(o, "Button 4");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 0, 1, 2, 1); efl_pack_table(table, o, 0, 1, 2, 1);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 5"); elm_object_text_set(o, "Button 5");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 2, 1, 1, 2); efl_pack_table(table, o, 2, 1, 1, 2);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win); objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 6"); elm_object_text_set(o, "Button 6");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 0, 2, 2, 1); efl_pack_table(table, o, 0, 2, 2, 1);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
efl_gfx_visible_set(win, 1); efl_gfx_entity_visible_set(win, 1);
} }
static const char * static const char *
@ -480,7 +480,7 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED)
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
elm_object_tooltip_text_set(o, "Click to unpack"); elm_object_tooltip_text_set(o, "Click to unpack");
efl_pack_end(table, o); efl_pack_end(table, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
} }
static void static void
@ -498,14 +498,14 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
win = elm_win_util_standard_add("ui-table-linear", "Efl.Ui.Table Linear APIs"); win = elm_win_util_standard_add("ui-table-linear", "Efl.Ui.Table Linear APIs");
elm_win_autodel_set(win, EINA_TRUE); elm_win_autodel_set(win, EINA_TRUE);
efl_gfx_size_set(win, EINA_SIZE2D(600, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
vbox = efl_add(EFL_UI_BOX_CLASS, win, vbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5);
elm_win_resize_object_add(win, vbox); elm_win_resize_object_add(win, vbox);
efl_gfx_visible_set(vbox, 1); efl_gfx_entity_visible_set(vbox, 1);
// create here to pass in cb // create here to pass in cb
@ -518,13 +518,13 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(f, -1, -1); efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 0); efl_gfx_size_hint_weight_set(f, 1, 0);
efl_pack(vbox, f); efl_pack(vbox, f);
efl_gfx_visible_set(f, 1); efl_gfx_entity_visible_set(f, 1);
hbox = efl_add(EFL_UI_BOX_CLASS, win, hbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
elm_object_content_set(f, hbox); elm_object_content_set(f, hbox);
efl_pack_padding_set(hbox, 5, 0, EINA_TRUE); efl_pack_padding_set(hbox, 5, 0, EINA_TRUE);
efl_gfx_visible_set(hbox, 1); efl_gfx_entity_visible_set(hbox, 1);
ico = elm_icon_add(win); ico = elm_icon_add(win);
elm_icon_standard_set(ico, "list-add"); elm_icon_standard_set(ico, "list-add");
@ -533,7 +533,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
elm_object_text_set(o, "Append"); elm_object_text_set(o, "Append");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table);
efl_pack(hbox, o); efl_pack(hbox, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
ico = elm_icon_add(win); ico = elm_icon_add(win);
elm_icon_standard_set(ico, "edit-clear-all"); elm_icon_standard_set(ico, "edit-clear-all");
@ -542,7 +542,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
elm_object_text_set(o, "Clear"); elm_object_text_set(o, "Clear");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table);
efl_pack(hbox, o); efl_pack(hbox, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* ro info */ /* ro info */
@ -551,17 +551,17 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 1, 1); efl_gfx_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx); efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1); efl_gfx_entity_visible_set(bx, 1);
o = elm_label_add(win); o = elm_label_add(win);
elm_object_text_set(o, "<b>Properties</>"); elm_object_text_set(o, "<b>Properties</>");
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(win); o = elm_label_add(win);
efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o); efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(win); o = elm_label_add(win);
efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
@ -569,7 +569,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(o, 0.5, 0); efl_gfx_size_hint_align_set(o, 0.5, 0);
efl_gfx_size_hint_weight_set(o, 1, 1); efl_gfx_size_hint_weight_set(o, 1, 1);
efl_pack(bx, o); efl_pack(bx, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
/* contents */ /* contents */
@ -578,31 +578,31 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(f, -1, -1); efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 1); efl_gfx_size_hint_weight_set(f, 1, 1);
efl_pack(vbox, f); efl_pack(vbox, f);
efl_gfx_visible_set(f, 1); efl_gfx_entity_visible_set(f, 1);
efl_pack_table_columns_set(table, 4); efl_pack_table_columns_set(table, 4);
efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN); efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN);
efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_content_set(f, table); elm_object_content_set(f, table);
efl_gfx_visible_set(table, 1); efl_gfx_entity_visible_set(table, 1);
o = elm_button_add(win); o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL)); elm_object_text_set(o, btn_text(NULL));
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o); efl_pack(table, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_button_add(win); o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL)); elm_object_text_set(o, btn_text(NULL));
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o); efl_pack(table, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = elm_button_add(win); o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL)); elm_object_text_set(o, btn_text(NULL));
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o); efl_pack(table, o);
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
efl_gfx_visible_set(win, 1); efl_gfx_entity_visible_set(win, 1);
} }

18
src/bin/elementary/test_ui_table_static.c
View File

@ -121,48 +121,48 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
elm_object_text_set(en, "Entry text"); elm_object_text_set(en, "Entry text");
elm_entry_single_line_set(en, EINA_TRUE); elm_entry_single_line_set(en, EINA_TRUE);
efl_pack_table(table, en, 50, 10, 40, 10); efl_pack_table(table, en, 50, 10, 40, 10);
efl_gfx_visible_set(en, 1); efl_gfx_entity_visible_set(en, 1);
en = elm_entry_add(win); en = elm_entry_add(win);
elm_entry_scrollable_set(en, EINA_TRUE); elm_entry_scrollable_set(en, EINA_TRUE);
elm_object_text_set(en, "Entry text 2"); elm_object_text_set(en, "Entry text 2");
elm_entry_single_line_set(en, EINA_TRUE); elm_entry_single_line_set(en, EINA_TRUE);
efl_pack_table(table, en, 60, 20, 30, 10); efl_pack_table(table, en, 60, 20, 30, 10);
efl_gfx_visible_set(en, 1); efl_gfx_entity_visible_set(en, 1);
bt = elm_button_add(win); bt = elm_button_add(win);
elm_object_text_set(bt, "Next API function"); elm_object_text_set(bt, "Next API function");
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api); efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
efl_pack_table(table, bt, 30, 0, 40, 10); efl_pack_table(table, bt, 30, 0, 40, 10);
elm_object_disabled_set(bt, api->state == API_STATE_LAST); elm_object_disabled_set(bt, api->state == API_STATE_LAST);
efl_gfx_visible_set(bt, 1); efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win); bt = elm_button_add(win);
elm_object_text_set(bt, "Button"); elm_object_text_set(bt, "Button");
efl_pack_table(table, bt, 0, 0, 20, 20); efl_pack_table(table, bt, 0, 0, 20, 20);
efl_gfx_visible_set(bt, 1); efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win); bt = elm_button_add(win);
elm_object_text_set(bt, "Button"); elm_object_text_set(bt, "Button");
efl_pack_table(table, bt, 10, 10, 40, 20); efl_pack_table(table, bt, 10, 10, 40, 20);
api->data.child = bt; api->data.child = bt;
efl_gfx_visible_set(bt, 1); efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win); bt = elm_button_add(win);
elm_object_text_set(bt, "Button"); elm_object_text_set(bt, "Button");
efl_pack_table(table, bt, 10, 30, 20, 50); efl_pack_table(table, bt, 10, 30, 20, 50);
efl_gfx_visible_set(bt, 1); efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win); bt = elm_button_add(win);
elm_object_text_set(bt, "Button"); elm_object_text_set(bt, "Button");
efl_pack_table(table, bt, 80, 80, 20, 20); efl_pack_table(table, bt, 80, 80, 20, 20);
efl_gfx_visible_set(bt, 1); efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win); bt = elm_button_add(win);
elm_object_text_set(bt, "Change"); elm_object_text_set(bt, "Change");
efl_pack_table(table, bt, 40, 40, 20, 20); efl_pack_table(table, bt, 40, 40, 20, 20);
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table); efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table);
efl_gfx_visible_set(bt, 1); efl_gfx_entity_visible_set(bt, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_color_set(rc, 128, 0, 0, 128); efl_gfx_color_set(rc, 128, 0, 0, 128);
@ -184,5 +184,5 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_gfx_color_set(rc, 128, 64, 0, 128); efl_gfx_color_set(rc, 128, 64, 0, 128);
efl_pack_table(table, rc, 60, 80, 10, 10); efl_pack_table(table, rc, 60, 80, 10, 10);
efl_gfx_size_set(win, EINA_SIZE2D(480, 480)); efl_gfx_entity_size_set(win, EINA_SIZE2D(480, 480));
} }

28
src/bin/elementary/test_ui_textpath.c
View File

@ -108,7 +108,7 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
elm_box_horizontal_set(box, EINA_FALSE); elm_box_horizontal_set(box, EINA_FALSE);
efl_gfx_size_hint_weight_set(box, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); efl_gfx_size_hint_weight_set(box, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_hint_align_set(box, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL); efl_gfx_size_hint_align_set(box, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
efl_gfx_visible_set(box, EINA_TRUE); efl_gfx_entity_visible_set(box, EINA_TRUE);
txtpath = efl_add(EFL_UI_TEXTPATH_CLASS, win); txtpath = efl_add(EFL_UI_TEXTPATH_CLASS, win);
elm_box_pack_end(box, txtpath); elm_box_pack_end(box, txtpath);
@ -117,14 +117,14 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_text_set(txtpath, TEST_UI_TEXTPATH_LONG_TEXT); efl_text_set(txtpath, TEST_UI_TEXTPATH_LONG_TEXT);
efl_ui_textpath_circle_set(txtpath, CX, CY, CR, 0, EFL_UI_TEXTPATH_DIRECTION_CCW); efl_ui_textpath_circle_set(txtpath, CX, CY, CR, 0, EFL_UI_TEXTPATH_DIRECTION_CCW);
efl_gfx_visible_set(txtpath, EINA_TRUE); efl_gfx_entity_visible_set(txtpath, EINA_TRUE);
path_type = 0; path_type = 0;
hbox = elm_box_add(win); hbox = elm_box_add(win);
elm_box_horizontal_set(hbox, EINA_TRUE); elm_box_horizontal_set(hbox, EINA_TRUE);
efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL); efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
efl_gfx_visible_set(hbox, EINA_TRUE); efl_gfx_entity_visible_set(hbox, EINA_TRUE);
elm_box_pack_end(box, hbox); elm_box_pack_end(box, hbox);
chk = elm_check_add(win); chk = elm_check_add(win);
@ -132,33 +132,33 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
elm_check_state_set(chk, efl_ui_textpath_autofit_get(txtpath)); elm_check_state_set(chk, efl_ui_textpath_autofit_get(txtpath));
efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _autofit_changed_cb, txtpath); efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _autofit_changed_cb, txtpath);
elm_box_pack_end(hbox, chk); elm_box_pack_end(hbox, chk);
efl_gfx_visible_set(chk, EINA_TRUE); efl_gfx_entity_visible_set(chk, EINA_TRUE);
chk = elm_check_add(win); chk = elm_check_add(win);
elm_object_text_set(chk, "Ellipsis"); elm_object_text_set(chk, "Ellipsis");
elm_check_state_set(chk, efl_ui_textpath_ellipsis_get(txtpath)); elm_check_state_set(chk, efl_ui_textpath_ellipsis_get(txtpath));
efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _ellipsis_changed_cb, txtpath); efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _ellipsis_changed_cb, txtpath);
elm_box_pack_end(hbox, chk); elm_box_pack_end(hbox, chk);
efl_gfx_visible_set(chk, EINA_TRUE); efl_gfx_entity_visible_set(chk, EINA_TRUE);
chk = elm_check_add(win); chk = elm_check_add(win);
elm_object_text_set(chk, "Clockwise"); elm_object_text_set(chk, "Clockwise");
efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _direction_changed_cb, txtpath); efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _direction_changed_cb, txtpath);
elm_box_pack_end(hbox, chk); elm_box_pack_end(hbox, chk);
efl_gfx_visible_set(chk, EINA_TRUE); efl_gfx_entity_visible_set(chk, EINA_TRUE);
dir_chk = chk; dir_chk = chk;
chk = elm_check_add(win); chk = elm_check_add(win);
elm_object_text_set(chk, "Short text"); elm_object_text_set(chk, "Short text");
efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _short_text_changed_cb, txtpath); efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _short_text_changed_cb, txtpath);
elm_box_pack_end(hbox, chk); elm_box_pack_end(hbox, chk);
efl_gfx_visible_set(chk, EINA_TRUE); efl_gfx_entity_visible_set(chk, EINA_TRUE);
hbox = elm_box_add(win); hbox = elm_box_add(win);
elm_box_horizontal_set(hbox, EINA_TRUE); elm_box_horizontal_set(hbox, EINA_TRUE);
efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL); efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
efl_gfx_visible_set(hbox, EINA_TRUE); efl_gfx_entity_visible_set(hbox, EINA_TRUE);
elm_box_pack_end(box, hbox); elm_box_pack_end(box, hbox);
sld = elm_slider_add(win); sld = elm_slider_add(win);
@ -170,7 +170,7 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0)); efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0));
efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath); efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath);
elm_box_pack_end(hbox, sld); elm_box_pack_end(hbox, sld);
efl_gfx_visible_set(sld, EINA_TRUE); efl_gfx_entity_visible_set(sld, EINA_TRUE);
angle_sld = sld; angle_sld = sld;
sld = elm_slider_add(win); sld = elm_slider_add(win);
@ -182,23 +182,23 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0)); efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0));
efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath); efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath);
elm_box_pack_end(hbox, sld); elm_box_pack_end(hbox, sld);
efl_gfx_visible_set(sld, EINA_TRUE); efl_gfx_entity_visible_set(sld, EINA_TRUE);
slice_sld = sld; slice_sld = sld;
hbox = elm_box_add(win); hbox = elm_box_add(win);
elm_box_horizontal_set(hbox, EINA_TRUE); elm_box_horizontal_set(hbox, EINA_TRUE);
efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL); efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
efl_gfx_visible_set(hbox, EINA_TRUE); efl_gfx_entity_visible_set(hbox, EINA_TRUE);
elm_box_pack_end(box, hbox); elm_box_pack_end(box, hbox);
btn = elm_button_add(win); btn = elm_button_add(win);
elm_object_text_set(btn, "Change Path"); elm_object_text_set(btn, "Change Path");
evas_object_smart_callback_add(btn, "clicked", _change_shape_cb, txtpath); evas_object_smart_callback_add(btn, "clicked", _change_shape_cb, txtpath);
elm_box_pack_end(hbox, btn); elm_box_pack_end(hbox, btn);
efl_gfx_visible_set(btn, EINA_TRUE); efl_gfx_entity_visible_set(btn, EINA_TRUE);
elm_win_resize_object_add(win, box); elm_win_resize_object_add(win, box);
efl_gfx_size_set(win, EINA_SIZE2D(400, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 400));
efl_gfx_visible_set(win, 1); efl_gfx_entity_visible_set(win, 1);
} }

10
src/bin/elementary/test_win_dialog.c
View File

@ -60,7 +60,7 @@ _size_update(void *data, const Efl_Event *ev)
cmin = efl_gfx_size_hint_combined_min_get(dia); cmin = efl_gfx_size_hint_combined_min_get(dia);
min = efl_gfx_size_hint_min_get(dia); min = efl_gfx_size_hint_min_get(dia);
max = efl_gfx_size_hint_max_get(dia); max = efl_gfx_size_hint_max_get(dia);
sz = efl_gfx_size_get(dia); sz = efl_gfx_entity_size_get(dia);
sprintf(buf, "This is a dialog with min/max size<br>" sprintf(buf, "This is a dialog with min/max size<br>"
"Min size: %dx%d (requested) %dx%d (effective)<br>" "Min size: %dx%d (requested) %dx%d (effective)<br>"
@ -83,8 +83,8 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
//lb = efl_add(EFL_UI_TEXT_CLASS, dia);, //lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
lb = elm_label_add(dia); lb = elm_label_add(dia);
efl_event_callback_add(dia, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
efl_event_callback_add(dia, EFL_GFX_EVENT_RESIZE, _size_update, lb); efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
elm_object_text_set(lb, "This is a Dialog Window"); elm_object_text_set(lb, "This is a Dialog Window");
efl_gfx_size_hint_weight_set(lb, 1.0, 1.0); efl_gfx_size_hint_weight_set(lb, 1.0, 1.0);
@ -110,8 +110,8 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
//lb = efl_add(EFL_UI_TEXT_CLASS, dia);, //lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
lb = elm_label_add(dia); lb = elm_label_add(dia);
efl_event_callback_add(dia, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
efl_event_callback_add(dia, EFL_GFX_EVENT_RESIZE, _size_update, lb); efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
elm_object_text_set(lb, "This is a Centered Dialog Window"); elm_object_text_set(lb, "This is a Centered Dialog Window");
efl_gfx_size_hint_weight_set(lb, 1.0, 1.0); efl_gfx_size_hint_weight_set(lb, 1.0, 1.0);

4
src/bin/elementary/test_win_indicator.c
View File

@ -49,7 +49,7 @@ _create_indicator(void)
efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL),
efl_pack(bx, efl_added)); efl_pack(bx, efl_added));
efl_gfx_size_set(win, EINA_SIZE2D(300, 30)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 30));
return win; return win;
} }
@ -97,7 +97,7 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)), efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator); efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator);
efl_gfx_size_set(win, EINA_SIZE2D(300, 360)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 360));
Eo *bx = efl_add(EFL_UI_BOX_CLASS, win, Eo *bx = efl_add(EFL_UI_BOX_CLASS, win,
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(300, 0)), efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(300, 0)),

4
src/examples/elementary/button_cxx_example_01.cc
View File

@ -5,7 +5,7 @@
using efl::eo::instantiate; using efl::eo::instantiate;
efl::Gfx icon_still(nullptr); efl::gfx::Entity icon_still(nullptr);
static void static void
efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
@ -117,7 +117,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
if (!icon_still) if (!icon_still)
{ {
efl::ui::Image obj(instantiate, cmid); efl::ui::Image obj(instantiate, cmid);
efl::eina::optional<efl::Gfx> icon_still_p = cmid.content_unset(); efl::eina::optional<efl::gfx::Entity> icon_still_p = cmid.content_unset();
if (icon_still_p) if (icon_still_p)
{ {
icon_still = *icon_still_p; icon_still = *icon_still_p;

4
src/examples/elementary/efl_ui_scroller_example.c
View File

@ -17,7 +17,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC, win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC,
efl_ui_win_autodel_set(efl_added, EINA_TRUE)); efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_size_set(win, EINA_SIZE2D(300, 400)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 400));
scroller = efl_add(EFL_UI_SCROLLER_CLASS, win); scroller = efl_add(EFL_UI_SCROLLER_CLASS, win);
efl_content_set(win, scroller); efl_content_set(win, scroller);
@ -25,7 +25,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
content = efl_add(EFL_UI_IMAGE_CLASS, scroller); content = efl_add(EFL_UI_IMAGE_CLASS, scroller);
snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
efl_file_set(content, buf, NULL); efl_file_set(content, buf, NULL);
efl_gfx_size_set(content, EINA_SIZE2D(5000, 5000)); efl_gfx_entity_size_set(content, EINA_SIZE2D(5000, 5000));
efl_content_set(scroller, content); efl_content_set(scroller, content);
} }
EFL_MAIN() EFL_MAIN()

4
src/examples/elementary/evas3d_object_on_button_example.c
View File

@ -258,8 +258,8 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
btn = elm_button_add(win); btn = elm_button_add(win);
evas_object_resize(btn, (WIDTH * 2) / 3, (HEIGHT * 2) / 3); evas_object_resize(btn, (WIDTH * 2) / 3, (HEIGHT * 2) / 3);

2
src/examples/elementary/evas3d_scene_on_button_example.c
View File

@ -249,7 +249,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
_scene_setup(&data); _scene_setup(&data);
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene); efl_canvas_scene3d_set(image, data.scene);

2
src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
View File

@ -814,7 +814,7 @@ elm_main(int argc, char **argv)
_scene_setup(&data, 10.0, 10); _scene_setup(&data, 10.0, 10);
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
efl_canvas_scene3d_set(image, data.scene); efl_canvas_scene3d_set(image, data.scene);
evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

12
src/examples/evas/evas-3d-aabb.c
View File

@ -110,8 +110,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -216,12 +216,12 @@ main(void)
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE);
efl_canvas_scene3d_set(image, scene); efl_canvas_scene3d_set(image, scene);

4
src/examples/evas/evas-3d-blending.c
View File

@ -126,8 +126,8 @@ _on_canvas_resize(Ecore_Evas *ee)
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
evas_object_resize(background, w, h); evas_object_resize(background, w, h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool

8
src/examples/evas/evas-3d-colorpick.c
View File

@ -120,8 +120,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(bg, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(bg, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -392,8 +392,8 @@ int main(int argc, char **argv)
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE);
efl_canvas_scene3d_set(image, globalscene.scene); efl_canvas_scene3d_set(image, globalscene.scene);

2
src/examples/evas/evas-3d-cube-rotate.c
View File

@ -262,7 +262,7 @@ main(void)
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_geometry_set(image, EINA_RECT(0, 0, WIDTH, HEIGHT)); efl_gfx_entity_geometry_set(image, EINA_RECT(0, 0, WIDTH, HEIGHT));
evas_object_show(image); evas_object_show(image);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */

12
src/examples/evas/evas-3d-cube.c
View File

@ -114,8 +114,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -239,13 +239,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene); efl_canvas_scene3d_set(image, data.scene);

12
src/examples/evas/evas-3d-cube2.c
View File

@ -78,8 +78,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -235,13 +235,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene); efl_canvas_scene3d_set(image, data.scene);

12
src/examples/evas/evas-3d-eet.c
View File

@ -91,8 +91,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
int int
@ -187,13 +187,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene); efl_canvas_scene3d_set(image, scene);

12
src/examples/evas/evas-3d-fog.c
View File

@ -61,8 +61,8 @@ _on_canvas_resize(Ecore_Evas *ee)
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
evas_object_resize(background, w, h); evas_object_resize(background, w, h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -212,14 +212,14 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene); efl_canvas_scene3d_set(image, data.scene);

12
src/examples/evas/evas-3d-hull.c
View File

@ -195,8 +195,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -433,13 +433,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_show(image), evas_object_show(image),
evas_object_focus_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE);

12
src/examples/evas/evas-3d-md2.c
View File

@ -68,8 +68,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
int int
@ -154,13 +154,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene); efl_canvas_scene3d_set(image, scene);

12
src/examples/evas/evas-3d-mmap-set.c
View File

@ -155,8 +155,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
int int
@ -235,13 +235,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 20, 20, 200, 255); efl_gfx_color_set(background, 20, 20, 200, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene); efl_canvas_scene3d_set(image, scene);

12
src/examples/evas/evas-3d-obj.c
View File

@ -133,8 +133,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
int int
@ -216,13 +216,13 @@ main(void)
/* Add a background rectangle MESHES. */ /* Add a background rectangle MESHES. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene); efl_canvas_scene3d_set(image, scene);

12
src/examples/evas/evas-3d-parallax-occlusion.c
View File

@ -80,8 +80,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -239,13 +239,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */

8
src/examples/evas/evas-3d-pick.c
View File

@ -169,13 +169,13 @@ main(void)
/* Add evas objects. */ /* Add evas objects. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_canvas_scene3d_set(image, scene); efl_canvas_scene3d_set(image, scene);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN,
_on_mouse_down, NULL); _on_mouse_down, NULL);

12
src/examples/evas/evas-3d-ply.c
View File

@ -98,8 +98,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
int int
@ -210,13 +210,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 100, 100, 100, 255); efl_gfx_color_set(background, 100, 100, 100, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene); efl_canvas_scene3d_set(image, scene);

18
src/examples/evas/evas-3d-proxy.c
View File

@ -63,8 +63,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -221,16 +221,16 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add a background image. */ /* Add a background image. */
#ifdef USE_EO_IMAGE #ifdef USE_EO_IMAGE
source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
efl_gfx_buffer_copy_set(source, NULL, EINA_SIZE2D(IMG_WIDTH, IMG_HEIGHT), 0, EFL_GFX_COLORSPACE_ARGB8888, 0); efl_gfx_buffer_copy_set(source, NULL, EINA_SIZE2D(IMG_WIDTH, IMG_HEIGHT), 0, EFL_GFX_COLORSPACE_ARGB8888, 0);
efl_gfx_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2))); efl_gfx_entity_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2)));
efl_gfx_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); efl_gfx_entity_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
efl_gfx_visible_set(source, EINA_TRUE); efl_gfx_entity_visible_set(source, EINA_TRUE);
#else #else
source = evas_object_image_filled_add(evas); source = evas_object_image_filled_add(evas);
evas_object_image_size_set(source, IMG_WIDTH, IMG_HEIGHT); evas_object_image_size_set(source, IMG_WIDTH, IMG_HEIGHT);
@ -241,8 +241,8 @@ main(void)
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); efl_gfx_entity_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Setup scene */ /* Setup scene */
_scene_setup(&data); _scene_setup(&data);

12
src/examples/evas/evas-3d-shadows.c
View File

@ -181,8 +181,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static void static void
@ -644,13 +644,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_anti_alias_set(image, EINA_TRUE); evas_object_anti_alias_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */

12
src/examples/evas/evas-3d-static-lod.c
View File

@ -66,8 +66,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(background, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
efl_gfx_size_set(image, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
} }
static Eina_Bool static Eina_Bool
@ -256,13 +256,13 @@ main(void)
/* Add a background rectangle object. */ /* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */ /* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(image, EINA_TRUE); efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */ /* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene); efl_canvas_scene3d_set(image, data.scene);

10
src/examples/evas/evas-map-utils-eo.c
View File

@ -90,7 +90,7 @@ _anim_cb(void *data)
o = evas_object_name_find(ad->canvas, "obj2"); o = evas_object_name_find(ad->canvas, "obj2");
h = efl_gfx_size_get(o).h; h = efl_gfx_entity_size_get(o).h;
efl_gfx_map_reset(o); efl_gfx_map_reset(o);
efl_gfx_map_smooth_set(o, ad->smooth); efl_gfx_map_smooth_set(o, ad->smooth);
efl_gfx_map_alpha_set(o, ad->alpha); efl_gfx_map_alpha_set(o, ad->alpha);
@ -105,7 +105,7 @@ _anim_cb(void *data)
o = evas_object_name_find(ad->canvas, "obj3"); o = evas_object_name_find(ad->canvas, "obj3");
EINA_SIZE2D(w, h) = efl_gfx_size_get(o); EINA_SIZE2D(w, h) = efl_gfx_entity_size_get(o);
efl_gfx_map_reset(o); efl_gfx_map_reset(o);
efl_gfx_map_smooth_set(o, ad->smooth); efl_gfx_map_smooth_set(o, ad->smooth);
efl_gfx_map_alpha_set(o, ad->alpha); efl_gfx_map_alpha_set(o, ad->alpha);
@ -122,13 +122,13 @@ _anim_cb(void *data)
-256, 255, 255, 255, 0, 0, 0); -256, 255, 255, 255, 0, 0, 0);
} }
if (ad->backface_culling) if (ad->backface_culling)
efl_gfx_visible_set(o, efl_gfx_map_clockwise_get(o)); efl_gfx_entity_visible_set(o, efl_gfx_map_clockwise_get(o));
else else
efl_gfx_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);
o = evas_object_name_find(ad->canvas, "obj4"); o = evas_object_name_find(ad->canvas, "obj4");
rect = efl_gfx_geometry_get(o); rect = efl_gfx_entity_geometry_get(o);
efl_gfx_map_reset(o); efl_gfx_map_reset(o);
efl_gfx_map_smooth_set(o, ad->smooth); efl_gfx_map_smooth_set(o, ad->smooth);
efl_gfx_map_alpha_set(o, ad->alpha); efl_gfx_map_alpha_set(o, ad->alpha);

30
src/examples/evas/evas-object-manipulation-eo.c
View File

@ -55,7 +55,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
int w, h; int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
efl_gfx_size_set(d.bg, EINA_SIZE2D(w, h)); efl_gfx_entity_size_set(d.bg, EINA_SIZE2D(w, h));
} }
static void static void
@ -141,8 +141,8 @@ _on_keydown(void *data EINA_UNUSED,
Eina_Bool visibility; Eina_Bool visibility;
/* Don't use "get"-"set" expressions in one eo_do call, /* Don't use "get"-"set" expressions in one eo_do call,
* if you pass parameter to "set" by value. */ * if you pass parameter to "set" by value. */
visibility = efl_gfx_visible_get(d.clipper); visibility = efl_gfx_entity_visible_get(d.clipper);
efl_gfx_visible_set(d.clipper, !visibility); efl_gfx_entity_visible_set(d.clipper, !visibility);
printf("Clipper is now %s\n", visibility ? "hidden" : "visible"); printf("Clipper is now %s\n", visibility ? "hidden" : "visible");
return; return;
} }
@ -176,11 +176,11 @@ main(void)
evas_object_name_set(d.bg, "background rectangle"); evas_object_name_set(d.bg, "background rectangle");
efl_gfx_color_set(d.bg, 255, 255, 255, 255); efl_gfx_color_set(d.bg, 255, 255, 255, 255);
/* white bg */ /* white bg */
efl_gfx_position_set(d.bg, EINA_POSITION2D(0, 0)); efl_gfx_entity_position_set(d.bg, EINA_POSITION2D(0, 0));
/* at canvas' origin */ /* at canvas' origin */
efl_gfx_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT));
/* covers full canvas */ /* covers full canvas */
efl_gfx_visible_set(d.bg, EINA_TRUE); efl_gfx_entity_visible_set(d.bg, EINA_TRUE);
evas_object_focus_set(d.bg, EINA_TRUE); evas_object_focus_set(d.bg, EINA_TRUE);
evas_object_event_callback_add( evas_object_event_callback_add(
@ -202,9 +202,9 @@ main(void)
} }
else else
{ {
efl_gfx_position_set(d.img, EINA_POSITION2D(0, 0)); efl_gfx_entity_position_set(d.img, EINA_POSITION2D(0, 0));
efl_gfx_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_entity_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT));
efl_gfx_visible_set(d.img, EINA_TRUE); efl_gfx_entity_visible_set(d.img, EINA_TRUE);
printf("Image object added, class name is: %s\n", printf("Image object added, class name is: %s\n",
efl_class_name_get(d.img)); efl_class_name_get(d.img));
} }
@ -222,9 +222,9 @@ main(void)
{ {
efl_image_border_set(d.clipper_border, 3, 3, 3, 3); efl_image_border_set(d.clipper_border, 3, 3, 3, 3);
efl_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE); efl_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE);
efl_gfx_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3)); efl_gfx_entity_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3));
efl_gfx_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6)); efl_gfx_entity_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6));
efl_gfx_visible_set(d.clipper_border, EINA_TRUE); efl_gfx_entity_visible_set(d.clipper_border, EINA_TRUE);
} }
/* solid white clipper (note that it's the default color for a /* solid white clipper (note that it's the default color for a
@ -232,9 +232,9 @@ main(void)
* by 255) */ * by 255) */
d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas); d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
efl_gfx_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4)); efl_gfx_entity_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4));
efl_gfx_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2)); efl_gfx_entity_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2));
efl_gfx_visible_set(d.clipper, EINA_TRUE); efl_gfx_entity_visible_set(d.clipper, EINA_TRUE);
efl_canvas_object_clip_set(d.img, d.clipper); efl_canvas_object_clip_set(d.img, d.clipper);

30
src/lib/edje/edje_calc.c
View File

@ -1548,7 +1548,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
return; return;
// Note: No need to add padding to that, it's already in the geometry // Note: No need to add padding to that, it's already in the geometry
sz = efl_gfx_size_get(ep->object); sz = efl_gfx_entity_size_get(ep->object);
mw = sz.w; mw = sz.w;
mh = sz.h; mh = sz.h;
@ -1716,7 +1716,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
evas_obj_text_style_set(ep->object, style); evas_obj_text_style_set(ep->object, style);
evas_obj_text_set(ep->object, text); evas_obj_text_set(ep->object, text);
ts = efl_gfx_size_get(ep->object); ts = efl_gfx_entity_size_get(ep->object);
if (chosen_desc->text.max_x) if (chosen_desc->text.max_x)
{ {
int l, r; int l, r;
@ -4702,7 +4702,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
case EDJE_PART_TYPE_EXTERNAL: case EDJE_PART_TYPE_EXTERNAL:
/* visibility and color have no meaning on SWALLOW and GROUP part. */ /* visibility and color have no meaning on SWALLOW and GROUP part. */
#ifdef HAVE_EPHYSICS #ifdef HAVE_EPHYSICS
efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
if ((ep->part->physics_body) && (!ep->body)) if ((ep->part->physics_body) && (!ep->body))
{ {
if (_edje_physics_world_geometry_check(ed->world)) if (_edje_physics_world_geometry_check(ed->world))
@ -4722,16 +4722,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
} }
} }
else else
efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
#else #else
efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
#endif #endif
if (ep->nested_smart) /* Move, Resize all nested parts */ if (ep->nested_smart) /* Move, Resize all nested parts */
{ /* Not really needed but will improve the bounding box evaluation done by Evas */ { /* Not really needed but will improve the bounding box evaluation done by Evas */
efl_gfx_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); efl_gfx_entity_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
efl_gfx_size_set(ep->nested_smart, EINA_SIZE2D(pf->final.w, pf->final.h)); efl_gfx_entity_size_set(ep->nested_smart, EINA_SIZE2D(pf->final.w, pf->final.h));
} }
if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
_edje_entry_real_part_configure(ed, ep); _edje_entry_real_part_configure(ed, ep);
@ -4766,16 +4766,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
Evas_Canvas3D_Camera *camera = NULL; Evas_Canvas3D_Camera *camera = NULL;
Edje_Part_Description_Camera *pd_camera; Edje_Part_Description_Camera *pd_camera;
efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->req.w, pf->req.h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->req.w, pf->req.h));
pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description; pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description;
efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)), efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)),
efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
viewport = evas_object_image_source_get(ep->object); viewport = evas_object_image_source_get(ep->object);
efl_gfx_size_set(viewport, EINA_SIZE2D(pf->req.w, pf->req.h)); efl_gfx_entity_size_set(viewport, EINA_SIZE2D(pf->req.w, pf->req.h));
evas_object_image_source_visible_set(ep->object, EINA_FALSE); evas_object_image_source_visible_set(ep->object, EINA_FALSE);
evas_object_image_source_events_set(ep->object, EINA_TRUE); evas_object_image_source_events_set(ep->object, EINA_TRUE);
@ -5021,9 +5021,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (ep->part->type == EDJE_PART_TYPE_GROUP) if (ep->part->type == EDJE_PART_TYPE_GROUP)
vis = evas_object_visible_get(ed->obj); vis = evas_object_visible_get(ed->obj);
efl_gfx_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); efl_gfx_entity_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
efl_gfx_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h)); efl_gfx_entity_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h));
efl_gfx_visible_set(ep->typedata.swallow->swallowed_object, vis); efl_gfx_entity_visible_set(ep->typedata.swallow->swallowed_object, vis);
} }
else evas_object_hide(ep->typedata.swallow->swallowed_object); else evas_object_hide(ep->typedata.swallow->swallowed_object);
mo = ep->typedata.swallow->swallowed_object; mo = ep->typedata.swallow->swallowed_object;

4
src/lib/edje/edje_legacy.c
View File

@ -195,13 +195,13 @@ EAPI const char *edje_object_language_get(const Edje_Object *obj)
EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale) EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale)
{ {
efl_gfx_scale_set(obj, scale); efl_gfx_entity_scale_set(obj, scale);
return EINA_TRUE; return EINA_TRUE;
} }
EAPI double edje_object_scale_get(const Edje_Object *obj) EAPI double edje_object_scale_get(const Edje_Object *obj)
{ {
return efl_gfx_scale_get(obj); return efl_gfx_entity_scale_get(obj);
} }
/* Legacy part drag APIs */ /* Legacy part drag APIs */

2
src/lib/edje/edje_part.c
View File

@ -99,7 +99,7 @@ _efl_canvas_layout_part_efl_object_finalize(Eo *obj EINA_UNUSED, Efl_Canvas_Layo
} }
EOLIAN Eina_Rect EOLIAN Eina_Rect
_efl_canvas_layout_part_efl_gfx_geometry_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Layout_Part_Data *pd) _efl_canvas_layout_part_efl_gfx_entity_geometry_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Layout_Part_Data *pd)
{ {
Edje_Real_Part *rp = pd->rp; Edje_Real_Part *rp = pd->rp;
Eina_Rect r = EINA_RECT_ZERO(); Eina_Rect r = EINA_RECT_ZERO();

22
src/lib/edje/edje_part_box.c
View File

@ -25,7 +25,7 @@ _efl_canvas_layout_part_box_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) _efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
Evas_Object *removed; Evas_Object *removed;
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
@ -34,42 +34,42 @@ _efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) _efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
return _edje_part_box_append(pd->ed, pd->part, subobj); return _edje_part_box_append(pd->ed, pd->part, subobj);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) _efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
return _edje_part_box_prepend(pd->ed, pd->part, subobj); return _edje_part_box_prepend(pd->ed, pd->part, subobj);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) _efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
return _edje_part_box_append(pd->ed, pd->part, subobj); return _edje_part_box_append(pd->ed, pd->part, subobj);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) _efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing); return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) _efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing); return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int index) _efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, int index)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
int cnt = efl_content_count(obj); int cnt = efl_content_count(obj);
@ -81,7 +81,7 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUS
return _edje_part_box_append(pd->ed, pd->part, subobj); return _edje_part_box_append(pd->ed, pd->part, subobj);
} }
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index) _efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
@ -91,7 +91,7 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EI
/* New APIs with Eo */ /* New APIs with Eo */
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index) _efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
@ -100,13 +100,13 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) _efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
return efl_pack_unpack(obj, subobj); return efl_pack_unpack(obj, subobj);
} }
EOLIAN static int EOLIAN static int
_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx * subobj) _efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx_Entity * subobj)
{ {
Evas_Object_Box_Option *opt; Evas_Object_Box_Option *opt;
Evas_Object_Box_Data *priv; Evas_Object_Box_Data *priv;

2
src/lib/edje/edje_part_external.c
View File

@ -15,7 +15,7 @@ _external_compose(Eo *obj, Edje *ed, const char *part)
efl_composite_attach(obj, ext_obj); efl_composite_attach(obj, ext_obj);
} }
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_external_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED) _efl_canvas_layout_part_external_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);

32
src/lib/edje/edje_part_invalid.c
View File

@ -38,7 +38,7 @@ _efl_canvas_layout_part_invalid_efl_canvas_layout_part_state_get(const Eo *proxy
} }
EDJE_PART_INVALID_CONST(Efl_Canvas_Layout_Part_Type, 0, efl_canvas_layout_part_type_get, _efl_canvas_layout_part_invalid_efl_canvas_layout_part_part_type_get) EDJE_PART_INVALID_CONST(Efl_Canvas_Layout_Part_Type, 0, efl_canvas_layout_part_type_get, _efl_canvas_layout_part_invalid_efl_canvas_layout_part_part_type_get)
EDJE_PART_INVALID_CONST(Eina_Rect, EINA_RECT_ZERO(), efl_gfx_geometry_get, _efl_canvas_layout_part_invalid_efl_gfx_geometry_get) EDJE_PART_INVALID_CONST(Eina_Rect, EINA_RECT_ZERO(), efl_gfx_entity_geometry_get, _efl_canvas_layout_part_invalid_efl_gfx_entity_geometry_get)
EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_value_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_set, double dx, double dy) EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_value_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_set, double dx, double dy)
EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_value_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_get, double *dx, double *dy) EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_value_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_get, double *dx, double *dy)
EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_size_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_size_set, double dw, double dh) EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_size_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_size_set, double dw, double dh)
@ -50,7 +50,7 @@ EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_step_move, _efl_canvas_layout_part_i
EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_set, double dx, double dy) EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_set, double dx, double dy)
EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_page_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_get, double *dx, double *dy) EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_page_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_get, double *dx, double *dy)
EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_move, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_move, double dx, double dy) EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_move, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_move, double dx, double dy)
EDJE_PART_INVALID(Eina_Bool, 0, efl_content_set, _efl_canvas_layout_part_invalid_efl_content_content_set, Efl_Gfx *content) EDJE_PART_INVALID(Eina_Bool, 0, efl_content_set, _efl_canvas_layout_part_invalid_efl_content_content_set, Efl_Gfx_Entity *content)
EDJE_PART_INVALID_CONST(Eo *, 0, efl_content_get, _efl_canvas_layout_part_invalid_efl_content_content_get) EDJE_PART_INVALID_CONST(Eo *, 0, efl_content_get, _efl_canvas_layout_part_invalid_efl_content_content_get)
EDJE_PART_INVALID(Eo *, 0, efl_content_unset, _efl_canvas_layout_part_invalid_efl_content_content_unset) EDJE_PART_INVALID(Eo *, 0, efl_content_unset, _efl_canvas_layout_part_invalid_efl_content_content_unset)
EDJE_PART_INVALID_VOID(efl_text_set, _efl_canvas_layout_part_invalid_efl_text_text_set, const char *text) EDJE_PART_INVALID_VOID(efl_text_set, _efl_canvas_layout_part_invalid_efl_text_text_set, const char *text)
@ -74,24 +74,24 @@ EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_text_cursor_geometry_get, _efl_canvas_
EDJE_PART_INVALID_VOID(efl_text_markup_cursor_markup_insert, _efl_canvas_layout_part_invalid_efl_text_markup_cursor_markup_insert, Efl_Text_Cursor_Cursor *cur, const char *markup) EDJE_PART_INVALID_VOID(efl_text_markup_cursor_markup_insert, _efl_canvas_layout_part_invalid_efl_text_markup_cursor_markup_insert, Efl_Text_Cursor_Cursor *cur, const char *markup)
EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate) EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate)
EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count) EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count)
EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx *content) EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx_Entity *content)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_clear, _efl_canvas_layout_part_invalid_efl_pack_pack_clear) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_clear, _efl_canvas_layout_part_invalid_efl_pack_pack_clear)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack_all, _efl_canvas_layout_part_invalid_efl_pack_unpack_all) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack_all, _efl_canvas_layout_part_invalid_efl_pack_unpack_all)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack, _efl_canvas_layout_part_invalid_efl_pack_unpack, Efl_Gfx *subobj) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack, _efl_canvas_layout_part_invalid_efl_pack_unpack, Efl_Gfx_Entity *subobj)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack, _efl_canvas_layout_part_invalid_efl_pack_pack, Efl_Gfx *subobj) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack, _efl_canvas_layout_part_invalid_efl_pack_pack, Efl_Gfx_Entity *subobj)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_begin, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_begin, Efl_Gfx *subobj) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_begin, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_begin, Efl_Gfx_Entity *subobj)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_end, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_end, Efl_Gfx *subobj) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_end, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_end, Efl_Gfx_Entity *subobj)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_before, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_before, Efl_Gfx *subobj, const Efl_Gfx *existing) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_before, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_before, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_after, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_after, Efl_Gfx *subobj, const Efl_Gfx *existing) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_after, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_after, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_at, Efl_Gfx *subobj, int index) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_at, Efl_Gfx_Entity *subobj, int index)
EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_content_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_content_get, int index) EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_content_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_content_get, int index)
EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_unpack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_unpack_at, int index) EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_unpack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_unpack_at, int index)
EDJE_PART_INVALID(int, 0, efl_pack_index_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_index_get, const Efl_Gfx *subobj) EDJE_PART_INVALID(int, 0, efl_pack_index_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_index_get, const Efl_Gfx_Entity *subobj)
EDJE_PART_INVALID_CONST(Efl_Ui_Dir, 0, efl_ui_direction_get, _efl_canvas_layout_part_invalid_efl_ui_direction_direction_get) EDJE_PART_INVALID_CONST(Efl_Ui_Dir, 0, efl_ui_direction_get, _efl_canvas_layout_part_invalid_efl_ui_direction_direction_get)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_table, _efl_canvas_layout_part_invalid_efl_pack_table_pack_table, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_table, _efl_canvas_layout_part_invalid_efl_pack_table_pack_table, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_table_content_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_content_get, int col, int row) EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_table_content_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_content_get, int col, int row)
EDJE_PART_INVALID(Eina_Iterator *, 0, efl_pack_table_contents_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_contents_get, int col, int row, Eina_Bool below) EDJE_PART_INVALID(Eina_Iterator *, 0, efl_pack_table_contents_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_contents_get, int col, int row, Eina_Bool below)
EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_pack_table_position_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_position_get, Efl_Gfx *subobj, int *col, int *row, int *colspan, int *rowspan) EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_pack_table_position_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_position_get, Efl_Gfx_Entity *subobj, int *col, int *row, int *colspan, int *rowspan)
EDJE_PART_INVALID_VOID_CONST(efl_pack_table_size_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_size_get, int *cols, int *rows) EDJE_PART_INVALID_VOID_CONST(efl_pack_table_size_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_size_get, int *cols, int *rows)
EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_columns_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_columns_get) EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_columns_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_columns_get)
EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_rows_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_rows_get) EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_rows_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_rows_get)

8
src/lib/edje/edje_part_swallow.c
View File

@ -7,7 +7,7 @@ PROXY_IMPLEMENTATION(swallow, MY_CLASS, EINA_FALSE)
#undef PROXY_IMPLEMENTATION #undef PROXY_IMPLEMENTATION
/* Swallow parts */ /* Swallow parts */
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_swallow_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED) _efl_canvas_layout_part_swallow_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
@ -15,17 +15,17 @@ _efl_canvas_layout_part_swallow_efl_content_content_get(const Eo *obj, void *_pd
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_swallow_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) _efl_canvas_layout_part_swallow_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *content)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
return _edje_efl_content_content_set(pd->ed, pd->part, content); return _edje_efl_content_content_set(pd->ed, pd->part, content);
} }
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_swallow_efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED) _efl_canvas_layout_part_swallow_efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
Efl_Gfx *content = _edje_efl_content_content_get(pd->ed, pd->part); Efl_Gfx_Entity *content = _edje_efl_content_content_get(pd->ed, pd->part);
if (!content) return NULL; if (!content) return NULL;
efl_content_remove(obj, content); efl_content_remove(obj, content);
return content; return content;

12
src/lib/edje/edje_part_table.c
View File

@ -30,7 +30,7 @@ _efl_canvas_layout_part_table_efl_container_content_count(Eo *obj, void *_pd EIN
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *content) _efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx_Entity *content)
{ {
return efl_pack_unpack(obj, content); return efl_pack_unpack(obj, content);
} }
@ -50,20 +50,20 @@ _efl_canvas_layout_part_table_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx *subobj) _efl_canvas_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
return _edje_part_table_unpack(pd->ed, pd->part, subobj); return _edje_part_table_unpack(pd->ed, pd->part, subobj);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_table_efl_pack_table_pack_table(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) _efl_canvas_layout_part_table_efl_pack_table_pack_table(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
return _edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan); return _edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan);
} }
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_table_efl_pack_table_table_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row) _efl_canvas_layout_part_table_efl_pack_table_table_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
@ -100,7 +100,7 @@ _efl_canvas_layout_part_table_efl_pack_table_table_rows_get(const Eo *obj, void
static Eina_Bool static Eina_Bool
_table_item_iterator_next(Part_Item_Iterator *it, void **data) _table_item_iterator_next(Part_Item_Iterator *it, void **data)
{ {
Efl_Gfx *sub; Efl_Gfx_Entity *sub;
if (!it->object) return EINA_FALSE; if (!it->object) return EINA_FALSE;
if (!eina_iterator_next(it->real_iterator, (void **) &sub)) if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@ -169,7 +169,7 @@ _efl_canvas_layout_part_table_efl_pack_table_table_contents_get(Eo *obj, void *_
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_part_table_efl_pack_table_table_position_get(const Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan) _efl_canvas_layout_part_table_efl_pack_table_table_position_get(const Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity * subobj, int *col, int *row, int *colspan, int *rowspan)
{ {
unsigned short c, r, cs, rs; unsigned short c, r, cs, rs;
Eina_Bool ret; Eina_Bool ret;

4
src/lib/edje/edje_private.h
View File

@ -3173,8 +3173,8 @@ Eina_Bool _edje_part_table_clear(Edje *ed, const char *part, Eina_Bool clear);
/* part containers: swallow */ /* part containers: swallow */
Eo *_edje_swallow_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); Eo *_edje_swallow_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part);
Efl_Gfx *_edje_efl_content_content_get(Edje *ed, const char *part); Efl_Gfx_Entity *_edje_efl_content_content_get(Edje *ed, const char *part);
Eina_Bool _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx *obj_swallow); Eina_Bool _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx_Entity *obj_swallow);
/* part containers: external */ /* part containers: external */
Eo *_edje_external_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); Eo *_edje_external_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part);

14
src/lib/edje/edje_smart.c
View File

@ -161,14 +161,14 @@ _efl_canvas_layout_efl_canvas_group_group_del(Eo *obj, Edje *ed)
} }
EOLIAN static void EOLIAN static void
_efl_canvas_layout_efl_gfx_position_set(Eo *obj, Edje *ed, Eina_Position2D pos) _efl_canvas_layout_efl_gfx_entity_position_set(Eo *obj, Edje *ed, Eina_Position2D pos)
{ {
unsigned short i; unsigned short i;
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return; return;
efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
if ((ed->x == pos.x) && (ed->y == pos.y)) return; if ((ed->x == pos.x) && (ed->y == pos.y)) return;
ed->x = pos.x; ed->x = pos.x;
@ -264,7 +264,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
} }
EOLIAN static void EOLIAN static void
_efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz) _efl_canvas_layout_efl_gfx_entity_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
{ {
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return; return;
@ -300,7 +300,7 @@ _efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
_edje_emit(ed, "resize", NULL); _edje_emit(ed, "resize", NULL);
super: super:
efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
} }
static void static void
@ -309,7 +309,7 @@ _edje_object_show(Eo *obj, Edje *ed)
Eina_List *l; Eina_List *l;
Edje *edg; Edje *edg;
efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE); efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
if (_edje_lua_script_only(ed)) if (_edje_lua_script_only(ed))
{ {
_edje_lua_script_only_show(ed); _edje_lua_script_only_show(ed);
@ -336,7 +336,7 @@ _edje_object_hide(Eo *obj, Edje *ed)
Eina_List *l; Eina_List *l;
Edje *edg; Edje *edg;
efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE); efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
if (_edje_lua_script_only(ed)) if (_edje_lua_script_only(ed))
{ {
_edje_lua_script_only_hide(ed); _edje_lua_script_only_hide(ed);
@ -348,7 +348,7 @@ _edje_object_hide(Eo *obj, Edje *ed)
} }
EOLIAN static void EOLIAN static void
_efl_canvas_layout_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis) _efl_canvas_layout_efl_gfx_entity_visible_set(Eo *obj, Edje *ed, Eina_Bool vis)
{ {
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return; return;

22
src/lib/edje/edje_text.c
View File

@ -22,7 +22,7 @@ part_get_geometry(Edje_Real_Part *rp, Evas_Coord *w, Evas_Coord *h)
{ {
if (!rp->part->use_alternate_font_metrics) if (!rp->part->use_alternate_font_metrics)
{ {
Eina_Size2D sz = efl_gfx_size_get(rp->object); Eina_Size2D sz = efl_gfx_entity_size_get(rp->object);
if (w) *w = sz.w; if (w) *w = sz.w;
if (h) *h = sz.h; if (h) *h = sz.h;
} }
@ -143,7 +143,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
evas_obj_text_ellipsis_set(ep->object, params->type.text->ellipsis); evas_obj_text_ellipsis_set(ep->object, params->type.text->ellipsis);
efl_text_font_set(ep->object, font, size); efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text); efl_text_set(ep->object, text);
efl_gfx_size_set(ep->object, EINA_SIZE2D(sw, sh)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(sw, sh));
return text; return text;
} }
@ -336,7 +336,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_font_source_set(ep->object, ed->path); if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
else efl_text_font_source_set(ep->object, NULL); else efl_text_font_source_set(ep->object, NULL);
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_set(ep->object, text); efl_text_set(ep->object, text);
/* the fit shoult not depend on font size, because it give the differet /* the fit shoult not depend on font size, because it give the differet
@ -366,7 +366,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_font_source_set(ep->object, ed->path); if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
else efl_text_font_source_set(ep->object, NULL); else efl_text_font_source_set(ep->object, NULL);
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, size); efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text); efl_text_set(ep->object, text);
@ -389,7 +389,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_font_source_set(ep->object, ed->path); if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
else efl_text_font_source_set(ep->object, NULL); else efl_text_font_source_set(ep->object, NULL);
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, size); efl_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
@ -401,7 +401,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{ {
int current; int current;
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, 10); efl_text_font_set(ep->object, font, 10);
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
@ -423,7 +423,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{ {
current = (top + bottom) / 2; current = (top + bottom) / 2;
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, current); efl_text_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
@ -439,7 +439,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{ {
current++; current++;
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, current); efl_text_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
@ -488,7 +488,7 @@ arrange_text:
if (inlined_font) efl_text_font_source_set(ep->object, ed->path); if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
else efl_text_font_source_set(ep->object, NULL); else efl_text_font_source_set(ep->object, NULL);
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, size); efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text); efl_text_set(ep->object, text);
@ -522,8 +522,8 @@ arrange_text:
Eina_Position2D pos; Eina_Position2D pos;
pos.x = ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x; pos.x = ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x;
pos.y = ed->y + TO_INT(params->eval.y) + ep->typedata.text->offset.y; pos.y = ed->y + TO_INT(params->eval.y) + ep->typedata.text->offset.y;
efl_gfx_position_set(ep->object, pos); efl_gfx_entity_position_set(ep->object, pos);
efl_gfx_visible_set(ep->object, params->visible); efl_gfx_entity_visible_set(ep->object, params->visible);
} }
{ {

26
src/lib/edje/edje_textblock.c
View File

@ -44,7 +44,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
tw = th = 0; tw = th = 0;
if (!chosen_desc->text.min_x) if (!chosen_desc->text.min_x)
{ {
efl_gfx_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th); efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
} }
else else
@ -70,7 +70,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
tw = th = 0; tw = th = 0;
if (!chosen_desc->text.max_x) if (!chosen_desc->text.max_x)
{ {
efl_gfx_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th); efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
} }
else else
@ -144,7 +144,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
* don't get meaningless height for multiline */ * don't get meaningless height for multiline */
if (temp_w > 0) if (temp_w > 0)
{ {
efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th); efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r; tw += ins_l + ins_r;
@ -182,7 +182,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
temp_h = *maxh; temp_h = *maxh;
} }
efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th); efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r; tw += ins_l + ins_r;
@ -267,7 +267,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
* don't get meaningless height for multiline */ * don't get meaningless height for multiline */
if (temp_w > 0) if (temp_w > 0)
{ {
efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th); efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r; tw += ins_l + ins_r;
@ -325,7 +325,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
/* text.min: 0 0 /* text.min: 0 0
* text.max: 1 1 */ * text.max: 1 1 */
efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th); efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r; tw += ins_l + ins_r;
@ -351,8 +351,8 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
if (min_calc_w > temp_w) if (min_calc_w > temp_w)
temp_w = min_calc_w; temp_w = min_calc_w;
temp_h = efl_gfx_size_get(ep->object).h; temp_h = efl_gfx_entity_size_get(ep->object).h;
efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th); efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r; tw += ins_l + ins_r;
@ -458,7 +458,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
double s = base_s; double s = base_s;
if (ep->part->scale) base_s = TO_DOUBLE(sc); if (ep->part->scale) base_s = TO_DOUBLE(sc);
efl_gfx_scale_set(ep->object, base_s); efl_gfx_entity_scale_set(ep->object, base_s);
efl_canvas_text_size_native_get(ep->object, &tw, &th); efl_canvas_text_size_native_get(ep->object, &tw, &th);
orig_s = base_s; orig_s = base_s;
@ -467,7 +467,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
{ {
orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw); orig_s * TO_INT(params->eval.w) / tw);
efl_gfx_scale_set(ep->object, orig_s); efl_gfx_entity_scale_set(ep->object, orig_s);
efl_canvas_text_size_native_get(ep->object, &tw, &th); efl_canvas_text_size_native_get(ep->object, &tw, &th);
} }
if (chosen_desc->text.fit_x) if (chosen_desc->text.fit_x)
@ -476,7 +476,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
{ {
s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw); orig_s * TO_INT(params->eval.w) / tw);
efl_gfx_scale_set(ep->object, s); efl_gfx_entity_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, NULL, NULL); efl_canvas_text_size_native_get(ep->object, NULL, NULL);
} }
} }
@ -493,7 +493,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
s = tmp_s; s = tmp_s;
} }
efl_gfx_scale_set(ep->object, s); efl_gfx_entity_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, NULL, NULL); efl_canvas_text_size_native_get(ep->object, NULL, NULL);
} }
} }
@ -518,7 +518,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
break; break;
s = tmp_s; s = tmp_s;
efl_gfx_scale_set(ep->object, s); efl_gfx_entity_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, &fw, &fh); efl_canvas_text_size_native_get(ep->object, &fw, &fh);
i--; i--;
} }

8
src/lib/edje/edje_util.c
View File

@ -364,7 +364,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout)
} }
EOLIAN void EOLIAN void
_efl_canvas_layout_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) _efl_canvas_layout_efl_gfx_entity_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
{ {
Edje *ged; Edje *ged;
Evas_Object *o; Evas_Object *o;
@ -390,7 +390,7 @@ _efl_canvas_layout_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale
} }
EOLIAN double EOLIAN double
_efl_canvas_layout_efl_gfx_scale_get(const Eo *obj EINA_UNUSED, Edje *ed) _efl_canvas_layout_efl_gfx_entity_scale_get(const Eo *obj EINA_UNUSED, Edje *ed)
{ {
return TO_DOUBLE(ed->scale); return TO_DOUBLE(ed->scale);
} }
@ -2908,7 +2908,7 @@ edje_object_part_text_prediction_hint_set(Eo *obj, const char *part, const char
} }
Eina_Bool Eina_Bool
_edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx *obj_swallow) _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx_Entity *obj_swallow)
{ {
Edje_Real_Part *rp, *rpcur; Edje_Real_Part *rp, *rpcur;
Edje_User_Defined *eud = NULL; Edje_User_Defined *eud = NULL;
@ -3267,7 +3267,7 @@ _efl_canvas_layout_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, E
return EINA_TRUE; return EINA_TRUE;
} }
Efl_Gfx * Efl_Gfx_Entity *
_edje_efl_content_content_get(Edje *ed, const char *part) _edje_efl_content_content_get(Edje *ed, const char *part)
{ {
Edje_Real_Part *rp; Edje_Real_Part *rp;

8
src/lib/edje/efl_canvas_layout.eo
View File

@ -80,9 +80,9 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
The value passed is the part name.]] The value passed is the part name.]]
} }
implements { implements {
Efl.Gfx.visible { set; } Efl.Gfx.Entity.visible { set; }
Efl.Gfx.position { set; } Efl.Gfx.Entity.position { set; }
Efl.Gfx.size { set; } Efl.Gfx.Entity.size { set; }
Efl.Object.constructor; Efl.Object.constructor;
Efl.Object.invalidate; Efl.Object.invalidate;
Efl.Object.debug_name_override; Efl.Object.debug_name_override;
@ -114,7 +114,7 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
Efl.Layout.Signal.signal_process; Efl.Layout.Signal.signal_process;
Efl.Ui.Base.mirrored { set; get; } Efl.Ui.Base.mirrored { set; get; }
Efl.Ui.Base.language { set; get; } Efl.Ui.Base.language { set; get; }
Efl.Gfx.scale { set; get; } Efl.Gfx.Entity.scale { set; get; }
Efl.File.load_error { get; } Efl.File.load_error { get; }
Efl.File.mmap { get; set; } Efl.File.mmap { get; set; }
Efl.Container.content_remove; Efl.Container.content_remove;

4
src/lib/edje/efl_canvas_layout_part.eo
View File

@ -1,6 +1,6 @@
import edje_types; import edje_types;
class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx, Efl.Ui.Drag) class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx.Entity, Efl.Ui.Drag)
{ {
[[Common class for part proxy objects for @Efl.Canvas.Layout. [[Common class for part proxy objects for @Efl.Canvas.Layout.
@ -39,7 +39,7 @@ class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx, Efl.Ui.Drag)
} }
implements { implements {
Efl.Object.finalize; Efl.Object.finalize;
Efl.Gfx.geometry { get; } Efl.Gfx.Entity.geometry { get; }
Efl.Ui.Drag.drag_value { set; get; } Efl.Ui.Drag.drag_value { set; get; }
Efl.Ui.Drag.drag_size { set; get; } Efl.Ui.Drag.drag_size { set; get; }
Efl.Ui.Drag.drag_dir { get; } Efl.Ui.Drag.drag_dir { get; }

2
src/lib/edje/efl_canvas_layout_part_invalid.eo
View File

@ -19,7 +19,7 @@ class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
// Efl.Canvas.Layout.Part // Efl.Canvas.Layout.Part
Efl.Canvas.Layout.Part.state { get; } Efl.Canvas.Layout.Part.state { get; }
Efl.Canvas.Layout.Part.part_type { get; } Efl.Canvas.Layout.Part.part_type { get; }
Efl.Gfx.geometry { get; } Efl.Gfx.Entity.geometry { get; }
Efl.Ui.Drag.drag_value { set; get; } Efl.Ui.Drag.drag_value { set; get; }
Efl.Ui.Drag.drag_size { set; get; } Efl.Ui.Drag.drag_size { set; get; }
Efl.Ui.Drag.drag_dir { get; } Efl.Ui.Drag.drag_dir { get; }

4
src/lib/efl/Efl.h
View File

@ -105,7 +105,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
#include "interfaces/efl_animator.eo.h" #include "interfaces/efl_animator.eo.h"
/* Graphics */ /* Graphics */
#include "interfaces/efl_gfx.eo.h" #include "interfaces/efl_gfx_entity.eo.h"
#include "interfaces/efl_gfx_color.eo.h" #include "interfaces/efl_gfx_color.eo.h"
#include "interfaces/efl_gfx_buffer.eo.h" #include "interfaces/efl_gfx_buffer.eo.h"
#include "interfaces/efl_gfx_stack.eo.h" #include "interfaces/efl_gfx_stack.eo.h"
@ -173,7 +173,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
#include "interfaces/efl_ui_types.eot.h" #include "interfaces/efl_ui_types.eot.h"
#include "interfaces/efl_input_types.eot.h" #include "interfaces/efl_input_types.eot.h"
#include "interfaces/efl_gfx_fill.eo.legacy.h" #include "interfaces/efl_gfx_fill.eo.legacy.h"
#include "interfaces/efl_gfx.eo.legacy.h" #include "interfaces/efl_gfx_entity.eo.legacy.h"
#include "interfaces/efl_image.eo.legacy.h" #include "interfaces/efl_image.eo.legacy.h"
#include "interfaces/efl_image_animated.eo.legacy.h" #include "interfaces/efl_image_animated.eo.legacy.h"
#include "interfaces/efl_input_device.eo.legacy.h" #include "interfaces/efl_input_device.eo.legacy.h"

8
src/lib/efl/interfaces/efl_canvas_scene.eo
View File

@ -49,7 +49,7 @@ interface Efl.Canvas.Scene ()
objects, acting only on the ones at the "top level", with objects, acting only on the ones at the "top level", with
regard to object parenting. regard to object parenting.
]] ]]
return: iterator<Efl.Gfx> @owned @warn_unused; [[ return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[
The list of objects that are over the given position in $e. The list of objects that are over the given position in $e.
]] ]]
params { params {
@ -77,7 +77,7 @@ interface Efl.Canvas.Scene ()
objects, acting only on the ones at the "top level", with objects, acting only on the ones at the "top level", with
regard to object parenting. regard to object parenting.
]] ]]
return: Efl.Gfx @warn_unused; [[The Evas object that is over all other objects at the given position.]] return: Efl.Gfx.Entity @warn_unused; [[The Evas object that is over all other objects at the given position.]]
params { params {
@in pos: Eina.Position2D; [[The pixel position.]] @in pos: Eina.Position2D; [[The pixel position.]]
@in include_pass_events_objects: bool; [[ @in include_pass_events_objects: bool; [[
@ -104,7 +104,7 @@ interface Efl.Canvas.Scene ()
objects, acting only on the ones at the "top level", with objects, acting only on the ones at the "top level", with
regard to object parenting. regard to object parenting.
]] ]]
return: iterator<Efl.Gfx> @owned @warn_unused; [[Iterator to objects]] return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[Iterator to objects]]
params { params {
@in rect: Eina.Rect; [[The rectangular region.]] @in rect: Eina.Rect; [[The rectangular region.]]
@in include_pass_events_objects: bool; [[ @in include_pass_events_objects: bool; [[
@ -131,7 +131,7 @@ interface Efl.Canvas.Scene ()
objects, acting only on the ones at the "top level", with objects, acting only on the ones at the "top level", with
regard to object parenting. regard to object parenting.
]] ]]
return: Efl.Gfx @warn_unused; [[ return: Efl.Gfx.Entity @warn_unused; [[
The object that is over all other objects at the given The object that is over all other objects at the given
rectangular region. rectangular region.
]] ]]

2
src/lib/efl/interfaces/efl_common_internal.h
View File

@ -43,7 +43,7 @@ struct _Efl_Input_Pointer_Data
int z; int z;
Eina_Bool horizontal; Eina_Bool horizontal;
} wheel; } wheel;
Efl_Gfx *source; /* could it be ecore? */ Efl_Gfx_Entity *source; /* could it be ecore? */
Efl_Input_Device *device; Efl_Input_Device *device;
Efl_Pointer_Action action; Efl_Pointer_Action action;
Efl_Pointer_Flags button_flags; Efl_Pointer_Flags button_flags;

8
src/lib/efl/interfaces/efl_container.eo
View File

@ -11,13 +11,13 @@ interface Efl.Container
content_remove { content_remove {
[[Unswallow an object from this container.]] [[Unswallow an object from this container.]]
params { params {
@in content: Efl.Gfx; [[To be removed content]] @in content: Efl.Gfx.Entity; [[To be removed content]]
} }
return: bool; [[$false if $content was not a child or can not be removed.]] return: bool; [[$false if $content was not a child or can not be removed.]]
} }
content_iterate { content_iterate {
[[Begin iterating over this object's contents.]] [[Begin iterating over this object's contents.]]
return: iterator<Efl.Gfx> @owned @warn_unused; [[Iterator to object content]] return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[Iterator to object content]]
} }
content_count { content_count {
[[Returns the number of UI elements packed in this container.]] [[Returns the number of UI elements packed in this container.]]
@ -25,7 +25,7 @@ interface Efl.Container
} }
} }
events { events {
content,added: Efl.Gfx; [[Sent after a new item was added.]] content,added: Efl.Gfx.Entity; [[Sent after a new item was added.]]
content,removed: Efl.Gfx; [[Sent after an item was removed, before unref.]] content,removed: Efl.Gfx.Entity; [[Sent after an item was removed, before unref.]]
} }
} }

4
src/lib/efl/interfaces/efl_content.eo
View File

@ -13,12 +13,12 @@ interface Efl.Content
} }
get {} get {}
values { values {
content: Efl.Gfx; [[The object to swallow.]] content: Efl.Gfx.Entity; [[The object to swallow.]]
} }
} }
content_unset { content_unset {
[[Unswallow the object in the current container and return it.]] [[Unswallow the object in the current container and return it.]]
return: Efl.Gfx; [[Unswallowed object]] return: Efl.Gfx.Entity; [[Unswallowed object]]
} }
} }
} }

4
src/lib/efl/interfaces/efl_gfx.eo → src/lib/efl/interfaces/efl_gfx_entity.eo
View File

@ -1,9 +1,9 @@
import eina_types; import eina_types;
import efl_gfx_types; import efl_gfx_types;
interface Efl.Gfx { interface Efl.Gfx.Entity {
[[Efl graphics interface]] [[Efl graphics interface]]
eo_prefix: efl_gfx; eo_prefix: efl_gfx_entity;
methods { methods {
@property position { @property position {
[[The 2D position of a canvas object. [[The 2D position of a canvas object.

2
src/lib/efl/interfaces/efl_gfx_filter.eo
View File

@ -85,7 +85,7 @@ interface Efl.Gfx.Filter
name: string; [[Buffer name as used in the program.]] name: string; [[Buffer name as used in the program.]]
} }
values { values {
source: Efl.Gfx; [[Object to use as a source of pixels.]] source: Efl.Gfx.Entity; [[Object to use as a source of pixels.]]
} }
} }
@property filter_data { @property filter_data {

2
src/lib/efl/interfaces/efl_gfx_size_hint.eo
View File

@ -9,7 +9,7 @@ const Efl.Gfx.Size.Hint.Fill: double = -1.0;
interface Efl.Gfx.Size.Hint interface Efl.Gfx.Size.Hint
{ {
[[Efl graphics size hint interface]] [[Efl graphics size hint interface]]
event_prefix: efl_gfx; event_prefix: efl_gfx_entity;
methods { methods {
@property hint_base { @property hint_base {
[[Base size for objects with sizing restrictions. [[Base size for objects with sizing restrictions.

2
src/lib/efl/interfaces/efl_gfx_stack.eo
View File

@ -4,7 +4,7 @@ const Efl.Gfx.Stack.Layer.Max: short = 32767; [[top-most layer number]]
interface Efl.Gfx.Stack interface Efl.Gfx.Stack
{ {
[[Efl graphics stack interface]] [[Efl graphics stack interface]]
event_prefix: efl_gfx; event_prefix: efl_gfx_entity;
methods { methods {
@property layer { @property layer {
set { set {

2
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -25,7 +25,7 @@
#include "interfaces/efl_text_annotate.eo.c" #include "interfaces/efl_text_annotate.eo.c"
#include "interfaces/efl_text_markup.eo.c" #include "interfaces/efl_text_markup.eo.c"
#include "interfaces/efl_gfx.eo.c" #include "interfaces/efl_gfx_entity.eo.c"
#include "interfaces/efl_gfx_buffer.eo.c" #include "interfaces/efl_gfx_buffer.eo.c"
#include "interfaces/efl_gfx_stack.eo.c" #include "interfaces/efl_gfx_stack.eo.c"
#include "interfaces/efl_gfx_fill.eo.c" #include "interfaces/efl_gfx_fill.eo.c"

4
src/lib/efl/interfaces/efl_pack.eo
View File

@ -19,7 +19,7 @@ interface Efl.Pack (Efl.Container)
unpack { unpack {
[[Removes an existing item from the container, without deleting it.]] [[Removes an existing item from the container, without deleting it.]]
params { params {
subobj: Efl.Gfx; [[The unpacked object.]] subobj: Efl.Gfx.Entity; [[The unpacked object.]]
} }
return: bool; [[$false if $subobj wasn't a child or can't be removed]] return: bool; [[$false if $subobj wasn't a child or can't be removed]]
} }
@ -35,7 +35,7 @@ interface Efl.Pack (Efl.Container)
without deleting it. without deleting it.
]] ]]
params { params {
subobj: Efl.Gfx; [[An object to pack.]] subobj: Efl.Gfx.Entity; [[An object to pack.]]
} }
return: bool; [[$false if $subobj could not be packed.]] return: bool; [[$false if $subobj could not be packed.]]
} }

20
src/lib/efl/interfaces/efl_pack_linear.eo
View File

@ -13,7 +13,7 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it. container without deleting it.
]] ]]
params { params {
@in subobj: Efl.Gfx; [[Item to pack.]] @in subobj: Efl.Gfx.Entity; [[Item to pack.]]
} }
return: bool; [[$false if $subobj could not be packed]] return: bool; [[$false if $subobj could not be packed]]
} }
@ -27,7 +27,7 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it. container without deleting it.
]] ]]
params { params {
@in subobj: Efl.Gfx; [[Item to pack at the end.]] @in subobj: Efl.Gfx.Entity; [[Item to pack at the end.]]
} }
return: bool; [[$false if $subobj could not be packed]] return: bool; [[$false if $subobj could not be packed]]
} }
@ -39,8 +39,8 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it. container without deleting it.
]] ]]
params { params {
@in subobj: Efl.Gfx; [[Item to pack before $existing.]] @in subobj: Efl.Gfx.Entity; [[Item to pack before $existing.]]
@in existing: const(Efl.Gfx); [[Item to refer to.]] @in existing: const(Efl.Gfx.Entity); [[Item to refer to.]]
} }
return: bool; [[$false if $existing could not be found or $subobj return: bool; [[$false if $existing could not be found or $subobj
could not be packed.]] could not be packed.]]
@ -53,8 +53,8 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it. container without deleting it.
]] ]]
params { params {
@in subobj: Efl.Gfx; [[Item to pack after $existing.]] @in subobj: Efl.Gfx.Entity; [[Item to pack after $existing.]]
@in existing: const(Efl.Gfx); [[Item to refer to.]] @in existing: const(Efl.Gfx.Entity); [[Item to refer to.]]
} }
return: bool; [[$false if $existing could not be found or $subobj return: bool; [[$false if $existing could not be found or $subobj
could not be packed.]] could not be packed.]]
@ -70,7 +70,7 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it. container without deleting it.
]] ]]
params { params {
@in subobj: Efl.Gfx; [[Item to pack at given index.]] @in subobj: Efl.Gfx.Entity; [[Item to pack at given index.]]
@in index: int; [[A position.]] @in index: int; [[A position.]]
} }
return: bool; [[$false if $subobj could not be packed.]] return: bool; [[$false if $subobj could not be packed.]]
@ -84,12 +84,12 @@ interface Efl.Pack.Linear (Efl.Pack)
params { params {
index: int; [[Index number]] index: int; [[Index number]]
} }
return: Efl.Gfx; [[The object contained at the given $index.]] return: Efl.Gfx.Entity; [[The object contained at the given $index.]]
} }
pack_index_get { pack_index_get {
[[Get the index of a child in this container.]] [[Get the index of a child in this container.]]
params { params {
subobj: const(Efl.Gfx); [[An object contained in this pack.]] subobj: const(Efl.Gfx.Entity); [[An object contained in this pack.]]
} }
return: int(-1); [[-1 in case of failure, or the index of this item.]] return: int(-1); [[-1 in case of failure, or the index of this item.]]
} }
@ -101,7 +101,7 @@ interface Efl.Pack.Linear (Efl.Pack)
params { params {
index: int; [[Index number]] index: int; [[Index number]]
} }
return: Efl.Gfx; [[The child item if it could be removed.]] return: Efl.Gfx.Entity; [[The child item if it could be removed.]]
} }
} }
} }

8
src/lib/efl/interfaces/efl_pack_table.eo
View File

@ -14,7 +14,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
container without deleting it. container without deleting it.
]] ]]
params { params {
subobj: Efl.Gfx; [[A child object to pack in this table.]] subobj: Efl.Gfx.Entity; [[A child object to pack in this table.]]
col: int; [[Column number]] col: int; [[Column number]]
row: int; [[Row number]] row: int; [[Row number]]
colspan: int @optional; [[0 means 1, -1 means @.table_columns]] colspan: int @optional; [[0 means 1, -1 means @.table_columns]]
@ -24,7 +24,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
} }
table_contents_get { table_contents_get {
[[Returns all objects at a given position in this table.]] [[Returns all objects at a given position in this table.]]
return: iterator<Efl.Gfx> @owned; [[Iterator to table contents]] return: iterator<Efl.Gfx.Entity> @owned; [[Iterator to table contents]]
params { params {
@in col: int; [[Column number]] @in col: int; [[Column number]]
@in row: int; [[Row number]] @in row: int; [[Row number]]
@ -33,7 +33,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
} }
table_content_get { table_content_get {
[[Returns a child at a given position, see @.table_contents_get.]] [[Returns a child at a given position, see @.table_contents_get.]]
return: Efl.Gfx; [[Child object]] return: Efl.Gfx.Entity; [[Child object]]
params { params {
@in col: int; [[Column number]] @in col: int; [[Column number]]
@in row: int; [[Row number]] @in row: int; [[Row number]]
@ -43,7 +43,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
[[Position and span of the $subobj in this container, may be modified to move the $subobj]] [[Position and span of the $subobj in this container, may be modified to move the $subobj]]
get { return: bool; [[Returns false if item is not a child]] } get { return: bool; [[Returns false if item is not a child]] }
keys { keys {
subobj: Efl.Gfx; [[Child object]] subobj: Efl.Gfx.Entity; [[Child object]]
} }
values { values {
col: int; [[Column number]] col: int; [[Column number]]

6
src/lib/efl/interfaces/efl_ui_factory.eo
View File

@ -6,14 +6,14 @@ interface Efl.Ui.Factory (Efl.Ui.Model.Connect)
[[Create a UI object from the necessary properties in the specified model.]] [[Create a UI object from the necessary properties in the specified model.]]
params { params {
model: Efl.Model; [[Efl model]] model: Efl.Model; [[Efl model]]
parent: Efl.Gfx; [[Efl canvas]] parent: Efl.Gfx.Entity; [[Efl canvas]]
} }
return: Efl.Gfx; [[Created UI object]] return: Efl.Gfx.Entity; [[Created UI object]]
} }
release { release {
[[Release a UI object and disconnect from models.]] [[Release a UI object and disconnect from models.]]
params { params {
ui_view: Efl.Gfx; [[Efl canvas]] ui_view: Efl.Gfx.Entity; [[Efl canvas]]
} }
} }
model_connect { model_connect {

2
src/lib/elementary/efl_access_component.c
View File

@ -72,7 +72,7 @@ _efl_access_component_extents_get(const Eo *obj, void *_pd EINA_UNUSED, Eina_Boo
{ {
Eina_Rect r; Eina_Rect r;
r = efl_gfx_geometry_get(obj); r = efl_gfx_entity_geometry_get(obj);
if (screen_coords) if (screen_coords)
{ {
Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj)); Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));

2
src/lib/elementary/efl_access_component.eo
View File

@ -1,6 +1,6 @@
import eina_types; import eina_types;
mixin Efl.Access.Component (Efl.Gfx, Efl.Gfx.Stack) mixin Efl.Access.Component (Efl.Gfx.Entity, Efl.Gfx.Stack)
{ {
[[AT-SPI component mixin]] [[AT-SPI component mixin]]
data: null; data: null;

2
src/lib/elementary/efl_page_transition.c
View File

@ -42,7 +42,7 @@ _efl_page_transition_bind(Eo *obj EINA_UNUSED,
if (pager) if (pager)
{ {
group_rect = efl_gfx_geometry_get(group); group_rect = efl_gfx_entity_geometry_get(group);
pd->pager.x = group_rect.x; pd->pager.x = group_rect.x;
pd->pager.y = group_rect.y; pd->pager.y = group_rect.y;

20
src/lib/elementary/efl_page_transition_scroll.c
View File

@ -148,7 +148,7 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
spd->pager.h); spd->pager.h);
} }
efl_gfx_geometry_set(pd->foreclip, (Eina_Rect) pd->viewport); efl_gfx_entity_geometry_set(pd->foreclip, (Eina_Rect) pd->viewport);
// this loop resets the geometry of each page based on the geometry of // this loop resets the geometry of each page based on the geometry of
// the pager object, the page size, and the padding size. // the pager object, the page size, and the padding size.
@ -176,7 +176,7 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
efl_canvas_object_clip_set(pi->obj, pd->backclip); efl_canvas_object_clip_set(pi->obj, pd->backclip);
} }
efl_gfx_geometry_set(pi->obj, (Eina_Rect) pi->geometry); efl_gfx_entity_geometry_set(pi->obj, (Eina_Rect) pi->geometry);
} }
if (efl_content_count(spd->pager.obj) > 0) _content_show(pd, spd); if (efl_content_count(spd->pager.obj) > 0) _content_show(pd, spd);
@ -193,7 +193,7 @@ _resize_cb(void *data, const Efl_Event *ev)
Efl_Ui_Pager *pager = ev->object; Efl_Ui_Pager *pager = ev->object;
sz = efl_gfx_size_get(pager); sz = efl_gfx_entity_size_get(pager);
spd->pager.w = sz.w; spd->pager.w = sz.w;
spd->pager.h = sz.h; spd->pager.h = sz.h;
@ -212,7 +212,7 @@ _move_cb(void *data, const Efl_Event *ev)
Efl_Ui_Pager *pager = ev->object; Efl_Ui_Pager *pager = ev->object;
pos = efl_gfx_position_get(pager); pos = efl_gfx_entity_position_get(pager);
spd->pager.x = pos.x; spd->pager.x = pos.x;
spd->pager.y = pos.y; spd->pager.y = pos.y;
@ -232,8 +232,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
if (spd->pager.obj) if (spd->pager.obj)
{ {
efl_event_callback_del(spd->pager.group, EFL_GFX_EVENT_RESIZE, _resize_cb, obj); efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, obj);
efl_event_callback_del(spd->pager.group, EFL_GFX_EVENT_MOVE, _move_cb, obj); efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj);
_page_info_deallocate(pd); _page_info_deallocate(pd);
efl_del(pd->foreclip); efl_del(pd->foreclip);
@ -247,8 +247,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
int cnt, i; int cnt, i;
Eo *item; Eo *item;
efl_event_callback_add(spd->pager.group, EFL_GFX_EVENT_RESIZE, _resize_cb, obj); efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, obj);
efl_event_callback_add(spd->pager.group, EFL_GFX_EVENT_MOVE, _move_cb, obj); efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj);
pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS, pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
evas_object_evas_get(spd->pager.obj)); evas_object_evas_get(spd->pager.obj));
@ -257,7 +257,7 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
pd->backclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS, pd->backclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
evas_object_evas_get(spd->pager.obj)); evas_object_evas_get(spd->pager.obj));
evas_object_static_clip_set(pd->backclip, EINA_TRUE); evas_object_static_clip_set(pd->backclip, EINA_TRUE);
efl_gfx_visible_set(pd->backclip, EINA_FALSE); efl_gfx_entity_visible_set(pd->backclip, EINA_FALSE);
cnt = efl_content_count(spd->pager.obj); cnt = efl_content_count(spd->pager.obj);
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
@ -328,7 +328,7 @@ _efl_page_transition_scroll_update(Eo *obj,
tpi->geometry.w, tpi->geometry.w,
tpi->geometry.h); tpi->geometry.h);
efl_gfx_geometry_set(pi->obj, (Eina_Rect) pi->temp); efl_gfx_entity_geometry_set(pi->obj, (Eina_Rect) pi->temp);
if (!pi->vis_page && !tpi->vis_page) continue; if (!pi->vis_page && !tpi->vis_page) continue;

2
src/lib/elementary/efl_ui_bg.eo
View File

@ -1,4 +1,4 @@
interface Efl.Ui.Bg (Efl.Interface, Efl.Gfx, Efl.Image, Efl.File) interface Efl.Ui.Bg (Efl.Interface, Efl.Gfx.Entity, Efl.Image, Efl.File)
{ {
[[The bg (background) widget is used for setting (solid) background decorations [[The bg (background) widget is used for setting (solid) background decorations

26
src/lib/elementary/efl_ui_box.c
View File

@ -220,7 +220,7 @@ _efl_ui_box_efl_pack_unpack_all(Eo *obj, Efl_Ui_Box_Data *pd)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx *subobj) _efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx_Entity *subobj)
{ {
Eina_Bool ret = EINA_FALSE; Eina_Bool ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -235,13 +235,13 @@ _efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx *subobj)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj) _efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
return efl_pack_end(obj, subobj); return efl_pack_end(obj, subobj);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj) _efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
Eina_Bool ret; Eina_Bool ret;
@ -254,7 +254,7 @@ _efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, E
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj) _efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{ {
Eina_Bool ret; Eina_Bool ret;
@ -267,7 +267,7 @@ _efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) _efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{ {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -284,7 +284,7 @@ _efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSE
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) _efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{ {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -302,7 +302,7 @@ _efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, _efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
Efl_Gfx *subobj, int index) Efl_Gfx_Entity *subobj, int index)
{ {
if (!index) if (!index)
return efl_pack_begin(obj, subobj); return efl_pack_begin(obj, subobj);
@ -328,13 +328,13 @@ _efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
} }
} }
static inline Efl_Gfx * static inline Efl_Gfx_Entity *
_box_item(Evas_Object_Box_Option *opt) _box_item(Evas_Object_Box_Option *opt)
{ {
return opt ? opt->obj : NULL; return opt ? opt->obj : NULL;
} }
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, _efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
int index) int index)
{ {
@ -365,11 +365,11 @@ _efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_U
return _box_item(eina_list_nth(bd->children, index)); return _box_item(eina_list_nth(bd->children, index));
} }
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, _efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
int index) int index)
{ {
Efl_Gfx *content; Efl_Gfx_Entity *content;
content = efl_pack_content_get(obj, index); content = efl_pack_content_get(obj, index);
if (!content) return NULL; if (!content) return NULL;
@ -382,7 +382,7 @@ _efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
EOLIAN static int EOLIAN static int
_efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, _efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
const Efl_Gfx *subobj) const Efl_Gfx_Entity *subobj)
{ {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, -1); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, -1);
Evas_Object_Box_Data *bd; Evas_Object_Box_Data *bd;
@ -416,7 +416,7 @@ _efl_ui_box_efl_pack_layout_layout_request(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
static Eina_Bool static Eina_Bool
_box_item_iterator_next(Box_Item_Iterator *it, void **data) _box_item_iterator_next(Box_Item_Iterator *it, void **data)
{ {
Efl_Gfx *sub; Efl_Gfx_Entity *sub;
if (!eina_iterator_next(it->real_iterator, (void **) &sub)) if (!eina_iterator_next(it->real_iterator, (void **) &sub))
return EINA_FALSE; return EINA_FALSE;

2
src/lib/elementary/efl_ui_calendar.c
View File

@ -1316,7 +1316,7 @@ _efl_ui_calendar_item_efl_ui_focus_object_focus_set(Eo *obj, Efl_Ui_Calendar_Ite
EOLIAN static Eina_Rect EOLIAN static Eina_Rect
_efl_ui_calendar_item_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Item_Data *pd) _efl_ui_calendar_item_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Item_Data *pd)
{ {
return efl_gfx_geometry_get(pd->part); return efl_gfx_entity_geometry_get(pd->part);
} }
#include "efl_ui_calendar_item.eo.c" #include "efl_ui_calendar_item.eo.c"

34
src/lib/elementary/efl_ui_flip.c
View File

@ -2124,7 +2124,7 @@ static void
_update_front_back(Eo *obj, Efl_Ui_Flip_Data *pd) _update_front_back(Eo *obj, Efl_Ui_Flip_Data *pd)
{ {
int count, index; int count, index;
Efl_Gfx *content; Efl_Gfx_Entity *content;
count = eina_list_count(pd->content_list); count = eina_list_count(pd->content_list);
if (count <= 2) return; if (count <= 2) return;
@ -2141,7 +2141,7 @@ _update_front_back(Eo *obj, Efl_Ui_Flip_Data *pd)
} }
static void static void
_content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content) _content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
{ {
evas_object_smart_member_add(content, obj); evas_object_smart_member_add(content, obj);
@ -2158,9 +2158,9 @@ _content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content)
} }
static void static void
_content_removed(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content) _content_removed(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
{ {
Efl_Gfx *back_face, *cur_face, *face; Efl_Gfx_Entity *back_face, *cur_face, *face;
int index, count; int index, count;
Eina_Bool state; Eina_Bool state;
@ -2216,7 +2216,7 @@ _efl_ui_flip_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content) _efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
{ {
pd->content_list = eina_list_remove(pd->content_list, content); pd->content_list = eina_list_remove(pd->content_list, content);
_content_removed(obj, pd, content); _content_removed(obj, pd, content);
@ -2224,7 +2224,7 @@ _efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj) _efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
{ {
pd->content_list = eina_list_remove(pd->content_list, subobj); pd->content_list = eina_list_remove(pd->content_list, subobj);
_content_removed(obj, pd, subobj); _content_removed(obj, pd, subobj);
@ -2232,7 +2232,7 @@ _efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_flip_efl_pack_pack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj) _efl_ui_flip_efl_pack_pack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
{ {
pd->content_list = eina_list_append(pd->content_list, subobj); pd->content_list = eina_list_append(pd->content_list, subobj);
_content_added(obj, pd, subobj); _content_added(obj, pd, subobj);
@ -2240,7 +2240,7 @@ _efl_ui_flip_efl_pack_pack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_flip_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj) _efl_ui_flip_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
{ {
pd->content_list = eina_list_prepend(pd->content_list, subobj); pd->content_list = eina_list_prepend(pd->content_list, subobj);
_content_added(obj, pd, subobj); _content_added(obj, pd, subobj);
@ -2249,7 +2249,7 @@ _efl_ui_flip_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_flip_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj) _efl_ui_flip_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
{ {
pd->content_list = eina_list_append(pd->content_list, subobj); pd->content_list = eina_list_append(pd->content_list, subobj);
_content_added(obj, pd, subobj); _content_added(obj, pd, subobj);
@ -2257,7 +2257,7 @@ _efl_ui_flip_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *su
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_flip_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) _efl_ui_flip_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{ {
pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing); pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing);
_content_added(obj, pd, subobj); _content_added(obj, pd, subobj);
@ -2265,7 +2265,7 @@ _efl_ui_flip_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_flip_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) _efl_ui_flip_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{ {
pd->content_list = eina_list_append_relative(pd->content_list, subobj, existing); pd->content_list = eina_list_append_relative(pd->content_list, subobj, existing);
_content_added(obj, pd, subobj); _content_added(obj, pd, subobj);
@ -2273,25 +2273,25 @@ _efl_ui_flip_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_flip_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, int index) _efl_ui_flip_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, int index)
{ {
Efl_Gfx *existing = NULL; Efl_Gfx_Entity *existing = NULL;
existing = eina_list_nth(pd->content_list, index); existing = eina_list_nth(pd->content_list, index);
pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing); pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing);
_content_added(obj, pd, subobj); _content_added(obj, pd, subobj);
return EINA_TRUE; return EINA_TRUE;
} }
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_ui_flip_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, int index) _efl_ui_flip_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, int index)
{ {
return eina_list_nth(pd->content_list, index); return eina_list_nth(pd->content_list, index);
} }
EOLIAN static Efl_Gfx * EOLIAN static Efl_Gfx_Entity *
_efl_ui_flip_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Flip_Data *pd, int index) _efl_ui_flip_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Flip_Data *pd, int index)
{ {
Efl_Gfx *content = eina_list_nth(pd->content_list ,index); Efl_Gfx_Entity *content = eina_list_nth(pd->content_list ,index);
pd->content_list = eina_list_remove(pd->content_list, content); pd->content_list = eina_list_remove(pd->content_list, content);
_content_removed(obj, pd, content); _content_removed(obj, pd, content);
@ -2299,7 +2299,7 @@ _efl_ui_flip_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Flip_Data *pd, int i
} }
EOLIAN static int EOLIAN static int
_efl_ui_flip_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, const Efl_Gfx *subobj) _efl_ui_flip_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, const Efl_Gfx_Entity *subobj)
{ {
return eina_list_data_idx(pd->content_list, (void *)subobj); return eina_list_data_idx(pd->content_list, (void *)subobj);
} }

10
src/lib/elementary/efl_ui_focus_composition.c
View File

@ -93,7 +93,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi
{ {
pd->register_target = eina_list_append(pd->register_target , o); pd->register_target = eina_list_append(pd->register_target , o);
} }
else if (efl_isa(elem, EFL_GFX_INTERFACE)) else if (efl_isa(elem, EFL_GFX_ENTITY_INTERFACE))
{ {
o = efl_add(EFL_UI_FOCUS_COMPOSITION_ADAPTER_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), efl_ui_focus_composition_adapter_canvas_object_set(efl_added, elem)); o = efl_add(EFL_UI_FOCUS_COMPOSITION_ADAPTER_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), efl_ui_focus_composition_adapter_canvas_object_set(efl_added, elem));
@ -102,7 +102,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi
} }
else else
{ {
EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or EFL_UI_WIDGET_CLASS"); EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_ENTITY_INTERFACE or EFL_UI_WIDGET_CLASS");
continue; continue;
} }
} }
@ -210,8 +210,8 @@ _new_geom(void *data, const Efl_Event *event)
EFL_CALLBACKS_ARRAY_DEFINE(canvas_obj, EFL_CALLBACKS_ARRAY_DEFINE(canvas_obj,
{EFL_GFX_EVENT_RESIZE, _new_geom}, {EFL_GFX_ENTITY_EVENT_RESIZE, _new_geom},
{EFL_GFX_EVENT_MOVE, _new_geom}, {EFL_GFX_ENTITY_EVENT_MOVE, _new_geom},
{EFL_EVENT_DEL, _canvas_object_deleted}, {EFL_EVENT_DEL, _canvas_object_deleted},
); );
@ -239,7 +239,7 @@ _efl_ui_focus_composition_adapter_canvas_object_get(const Eo *obj EINA_UNUSED, E
EOLIAN static Eina_Rect EOLIAN static Eina_Rect
_efl_ui_focus_composition_adapter_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Focus_Composition_Adapter_Data *pd EINA_UNUSED) _efl_ui_focus_composition_adapter_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Focus_Composition_Adapter_Data *pd EINA_UNUSED)
{ {
return efl_gfx_geometry_get(pd->object); return efl_gfx_entity_geometry_get(pd->object);
} }
EOLIAN static void EOLIAN static void

4
src/lib/elementary/efl_ui_focus_composition.eo
View File

@ -9,14 +9,14 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Efl.Ui.Widget) {
Elements of the list can be either an Efl.Ui.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx. Elements of the list can be either an Efl.Ui.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx.
If the element is an Efl.Gfx, then the geometry is used as focus geometry, the focus property is redirected to the evas focus property. The mixin will take care of registration. If the element is an Efl.Gfx.Entity, then the geometry is used as focus geometry, the focus property is redirected to the evas focus property. The mixin will take care of registration.
If the element is an Efl.Ui.Focus.Object, then the mixin will take care of registering the element. If the element is an Efl.Ui.Focus.Object, then the mixin will take care of registering the element.
If the element is a Efl.Ui.Widget nothing is done and the widget is simply part of the order. If the element is a Efl.Ui.Widget nothing is done and the widget is simply part of the order.
]] ]]
values { values {
logical_order : list<Efl.Gfx> @owned; [[The order to use]] logical_order : list<Efl.Gfx.Entity> @owned; [[The order to use]]
} }
} }
dirty @protected { dirty @protected {

4
src/lib/elementary/efl_ui_focus_layer.c
View File

@ -23,9 +23,9 @@ _efl_ui_focus_layer_efl_ui_widget_focus_manager_create(Eo *obj, Efl_Ui_Focus_Lay
} }
EOLIAN static void EOLIAN static void
_efl_ui_focus_layer_efl_gfx_visible_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v) _efl_ui_focus_layer_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v)
{ {
efl_gfx_visible_set(efl_super(obj, MY_CLASS), v); efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), v);
if (pd->enable_on_visible) if (pd->enable_on_visible)
{ {

4
src/lib/elementary/efl_ui_focus_layer.eo
View File

@ -1,4 +1,4 @@
mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) { mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx.Entity, Efl.Ui.Focus.Manager) {
[[This defines the inheriting widget as focus layer [[This defines the inheriting widget as focus layer
A focus layer is the uppermost one which received input and handles all focus related events for as long as it exists and is visible. It's NOT possible to escape this layer with focus movement. A focus layer is the uppermost one which received input and handles all focus related events for as long as it exists and is visible. It's NOT possible to escape this layer with focus movement.
@ -23,7 +23,7 @@ mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx, Efl.Ui.Focus.Ma
implements { implements {
Efl.Ui.Widget.focus_manager_create; Efl.Ui.Widget.focus_manager_create;
Efl.Ui.Widget.focus_state_apply; Efl.Ui.Widget.focus_state_apply;
Efl.Gfx.visible {set;} Efl.Gfx.Entity.visible {set;}
Efl.Ui.Focus.Manager.move; Efl.Ui.Focus.Manager.move;
Efl.Ui.Focus.Object.focus_manager { get; } Efl.Ui.Focus.Object.focus_manager { get; }
Efl.Ui.Focus.Object.focus_parent { get; } Efl.Ui.Focus.Object.focus_parent { get; }

4
src/lib/elementary/efl_ui_focus_manager_calc.c
View File

@ -715,8 +715,8 @@ _object_del_cb(void *data, const Efl_Event *event)
} }
EFL_CALLBACKS_ARRAY_DEFINE(regular_node, EFL_CALLBACKS_ARRAY_DEFINE(regular_node,
{EFL_GFX_EVENT_RESIZE, _node_new_geometry_cb}, {EFL_GFX_ENTITY_EVENT_RESIZE, _node_new_geometry_cb},
{EFL_GFX_EVENT_MOVE, _node_new_geometry_cb}, {EFL_GFX_ENTITY_EVENT_MOVE, _node_new_geometry_cb},
{EFL_EVENT_DEL, _object_del_cb}, {EFL_EVENT_DEL, _object_del_cb},
); );

24
src/lib/elementary/efl_ui_image.c
View File

@ -594,7 +594,7 @@ EOLIAN static void
_efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd) _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
{ {
if (elm_widget_is_legacy(obj)) if (elm_widget_is_legacy(obj))
efl_event_callback_del(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
_on_size_hints_changed, sd); _on_size_hints_changed, sd);
ecore_timer_del(sd->anim_timer); ecore_timer_del(sd->anim_timer);
evas_object_del(sd->img); evas_object_del(sd->img);
@ -622,12 +622,12 @@ _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
} }
EOLIAN static void EOLIAN static void
_efl_ui_image_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Position2D pos) _efl_ui_image_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Position2D pos)
{ {
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return; return;
efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
if ((sd->img_x == pos.x) && (sd->img_y == pos.y)) return; if ((sd->img_x == pos.x) && (sd->img_y == pos.y)) return;
sd->img_x = pos.x; sd->img_x = pos.x;
@ -638,7 +638,7 @@ _efl_ui_image_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Position
} }
EOLIAN static void EOLIAN static void
_efl_ui_image_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz) _efl_ui_image_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
{ {
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return; return;
@ -652,7 +652,7 @@ _efl_ui_image_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
_efl_ui_image_internal_sizing_eval(obj, sd); _efl_ui_image_internal_sizing_eval(obj, sd);
super: super:
efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
} }
static void static void
@ -660,10 +660,10 @@ _efl_ui_image_show(Eo *obj, Efl_Ui_Image_Data *sd)
{ {
sd->show = EINA_TRUE; sd->show = EINA_TRUE;
efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE); efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return; if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return;
efl_gfx_visible_set(sd->img, EINA_TRUE); efl_gfx_entity_visible_set(sd->img, EINA_TRUE);
_prev_img_del(sd); _prev_img_del(sd);
} }
@ -671,13 +671,13 @@ static void
_efl_ui_image_hide(Eo *obj, Efl_Ui_Image_Data *sd) _efl_ui_image_hide(Eo *obj, Efl_Ui_Image_Data *sd)
{ {
sd->show = EINA_FALSE; sd->show = EINA_FALSE;
efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE); efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
efl_gfx_visible_set(sd->img, EINA_FALSE); efl_gfx_entity_visible_set(sd->img, EINA_FALSE);
_prev_img_del(sd); _prev_img_del(sd);
} }
EOLIAN static void EOLIAN static void
_efl_ui_image_efl_gfx_visible_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool vis) _efl_ui_image_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool vis)
{ {
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return; return;
@ -767,7 +767,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj)
if (sd->no_scale) if (sd->no_scale)
_efl_ui_image_internal_scale_set(obj, sd, 1.0); _efl_ui_image_internal_scale_set(obj, sd, 1.0);
else else
_efl_ui_image_internal_scale_set(obj, sd, efl_gfx_scale_get(obj) * elm_config_scale_get()); _efl_ui_image_internal_scale_set(obj, sd, efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
ts = sd->scale; ts = sd->scale;
sd->scale = 1.0; sd->scale = 1.0;
@ -2290,7 +2290,7 @@ elm_image_add(Evas_Object *parent)
Evas_Object *obj = elm_legacy_add(EFL_UI_IMAGE_LEGACY_CLASS, parent); Evas_Object *obj = elm_legacy_add(EFL_UI_IMAGE_LEGACY_CLASS, parent);
EFL_UI_IMAGE_DATA_GET(obj, priv); EFL_UI_IMAGE_DATA_GET(obj, priv);
efl_event_callback_add(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_size_hints_changed, priv); efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_size_hints_changed, priv);
return obj; return obj;
} }

6
src/lib/elementary/efl_ui_image.eo
View File

@ -92,9 +92,9 @@ class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
Efl.File.file { get; set; } Efl.File.file { get; set; }
Efl.File.mmap { set; } Efl.File.mmap { set; }
Efl.Gfx.Color.color { set; } Efl.Gfx.Color.color { set; }
Efl.Gfx.visible { set; } Efl.Gfx.Entity.visible { set; }
Efl.Gfx.position { set; } Efl.Gfx.Entity.position { set; }
Efl.Gfx.size { set; } Efl.Gfx.Entity.size { set; }
Efl.Gfx.View.view_size { get; } Efl.Gfx.View.view_size { get; }
Efl.Image.image_size { get; } Efl.Image.image_size { get; }
Efl.Image.Load.load_size { get; set; } Efl.Image.Load.load_size { get; set; }

Some files were not shown because too many files have changed in this diff Show More