rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: Rename Evas.Object to Efl.Canvas.Object 

One step closer to make the EO inheritance tree look like
it's all Efl.
This commit is contained in:
Jean-Philippe Andre 2016-06-21 13:26:15 +09:00
parent 2f0b9edbb4
commit 7bf8da2baa
198 changed files with 1004 additions and 1002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Evas.am
View File

@ -2,7 +2,7 @@
### Library
evas_eolian_pub_files = \
lib/evas/canvas/evas_object.eo \
lib/evas/canvas/efl_canvas_object.eo \
lib/evas/canvas/efl_canvas_polygon.eo \
lib/evas/canvas/efl_canvas_rectangle.eo \
lib/evas/canvas/efl_canvas_text.eo \

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

@ -126,15 +126,15 @@ _on_keydown(void *data EINA_UNUSED,
fprintf(stdout, "Toggling clipping ");
Evas_Object *clip = NULL;
clip = evas_obj_clip_get(d.img);
clip = efl_canvas_object_clip_get(d.img);
if (clip == d.clipper)
{
evas_obj_clip_unset(d.img);
efl_canvas_object_clip_unset(d.img);
fprintf(stdout, "off\n");
}
else
{
evas_obj_clip_set(d.img, d.clipper);
efl_canvas_object_clip_set(d.img, d.clipper);
fprintf(stdout, "on\n");
}
return;
@ -239,7 +239,7 @@ main(void)
efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2);
efl_gfx_visible_set(d.clipper, EINA_TRUE);
evas_obj_clip_set(d.img, d.clipper);
efl_canvas_object_clip_set(d.img, d.clipper);
fprintf(stdout, "%s", commands);

72
src/lib/ecore_evas/ecore_evas_util.c
View File

@ -59,7 +59,7 @@ _evas_object_associate_del(Evas_Object *obj)
/* Interceptors Callbacks */
static void
_ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)
_ecore_evas_object_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Ecore_Evas *ee = data;
// FIXME: account for frame
@ -68,33 +68,33 @@ _ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_
}
static void
_ecore_evas_obj_intercept_raise(void *data, Evas_Object *obj EINA_UNUSED)
_ecore_evas_object_intercept_raise(void *data, Evas_Object *obj EINA_UNUSED)
{
Ecore_Evas *ee = data;
ecore_evas_raise(ee);
}
static void
_ecore_evas_obj_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
_ecore_evas_object_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
{
Ecore_Evas *ee = data;
ecore_evas_lower(ee);
}
static void
_ecore_evas_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
{
INF("TODO: %s", __FUNCTION__);
}
static void
_ecore_evas_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
{
INF("TODO: %s", __FUNCTION__);
}
static void
_ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l)
_ecore_evas_object_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l)
{
Ecore_Evas *ee = data;
ecore_evas_layer_set(ee, l);
@ -103,21 +103,21 @@ _ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, in
/* Event Callbacks */
static void
_ecore_evas_obj_callback_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
_ecore_evas_object_callback_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ecore_Evas *ee = data;
ecore_evas_show(ee);
}
static void
_ecore_evas_obj_callback_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
_ecore_evas_object_callback_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ecore_Evas *ee = data;
ecore_evas_hide(ee);
}
static void
_ecore_evas_obj_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
_ecore_evas_object_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Ecore_Evas *ee = data;
Evas_Coord ow, oh;
@ -127,7 +127,7 @@ _ecore_evas_obj_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *ob
}
static void
_ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
_ecore_evas_object_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Ecore_Evas *ee = data;
Evas_Coord w, h;
@ -142,7 +142,7 @@ _ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Eva
}
static void
_ecore_evas_obj_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
_ecore_evas_object_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Ecore_Evas *ee = data;
_ecore_evas_object_dissociate(ee, obj);
@ -150,7 +150,7 @@ _ecore_evas_obj_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
}
static void
_ecore_evas_obj_callback_del_dissociate(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
_ecore_evas_object_callback_del_dissociate(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Ecore_Evas *ee = data;
_ecore_evas_object_dissociate(ee, obj);
@ -293,41 +293,41 @@ _ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object
{
evas_object_event_callback_add
(obj, EVAS_CALLBACK_SHOW,
_ecore_evas_obj_callback_show, ee);
_ecore_evas_object_callback_show, ee);
evas_object_event_callback_add
(obj, EVAS_CALLBACK_HIDE,
_ecore_evas_obj_callback_hide, ee);
_ecore_evas_object_callback_hide, ee);
evas_object_event_callback_add
(obj, EVAS_CALLBACK_RESIZE,
_ecore_evas_obj_callback_resize, ee);
_ecore_evas_object_callback_resize, ee);
evas_object_event_callback_add
(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_ecore_evas_obj_callback_changed_size_hints, ee);
_ecore_evas_object_callback_changed_size_hints, ee);
if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL)
evas_object_event_callback_add
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee);
(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del, ee);
else
evas_object_event_callback_add
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee);
(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del_dissociate, ee);
evas_object_intercept_move_callback_add
(obj, _ecore_evas_obj_intercept_move, ee);
(obj, _ecore_evas_object_intercept_move, ee);
if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_STACK)
{
evas_object_intercept_raise_callback_add
(obj, _ecore_evas_obj_intercept_raise, ee);
(obj, _ecore_evas_object_intercept_raise, ee);
evas_object_intercept_lower_callback_add
(obj, _ecore_evas_obj_intercept_lower, ee);
(obj, _ecore_evas_object_intercept_lower, ee);
evas_object_intercept_stack_above_callback_add
(obj, _ecore_evas_obj_intercept_stack_above, ee);
(obj, _ecore_evas_object_intercept_stack_above, ee);
evas_object_intercept_stack_below_callback_add
(obj, _ecore_evas_obj_intercept_stack_below, ee);
(obj, _ecore_evas_object_intercept_stack_below, ee);
}
if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_LAYER)
evas_object_intercept_layer_set_callback_add
(obj, _ecore_evas_obj_intercept_layer_set, ee);
(obj, _ecore_evas_object_intercept_layer_set, ee);
if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL)
{
@ -346,35 +346,35 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
{
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_SHOW,
_ecore_evas_obj_callback_show, ee);
_ecore_evas_object_callback_show, ee);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_HIDE,
_ecore_evas_obj_callback_hide, ee);
_ecore_evas_object_callback_hide, ee);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_RESIZE,
_ecore_evas_obj_callback_resize, ee);
_ecore_evas_object_callback_resize, ee);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_ecore_evas_obj_callback_changed_size_hints, ee);
_ecore_evas_object_callback_changed_size_hints, ee);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee);
(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del, ee);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee);
(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del_dissociate, ee);
evas_object_intercept_move_callback_del
(obj, _ecore_evas_obj_intercept_move);
(obj, _ecore_evas_object_intercept_move);
evas_object_intercept_raise_callback_del
(obj, _ecore_evas_obj_intercept_raise);
(obj, _ecore_evas_object_intercept_raise);
evas_object_intercept_lower_callback_del
(obj, _ecore_evas_obj_intercept_lower);
(obj, _ecore_evas_object_intercept_lower);
evas_object_intercept_stack_above_callback_del
(obj, _ecore_evas_obj_intercept_stack_above);
(obj, _ecore_evas_object_intercept_stack_above);
evas_object_intercept_stack_below_callback_del
(obj, _ecore_evas_obj_intercept_stack_below);
(obj, _ecore_evas_object_intercept_stack_below);
evas_object_intercept_layer_set_callback_del
(obj, _ecore_evas_obj_intercept_layer_set);
(obj, _ecore_evas_object_intercept_layer_set);
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{

2
src/lib/edje/Edje_Legacy.h
View File

@ -492,7 +492,7 @@ EAPI Eina_Bool edje_object_part_table_col_row_size_get(const Edje_Object *obj, c
* @param[in] col The column of the child to get
* @param[in] row The row of the child to get
*
* @return The child Evas.Object
* @return The child Efl.Canvas.Object
*
* @ingroup Edje_Object
*/

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

@ -1494,7 +1494,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
double s = base_s;
if (ep->part->scale) base_s = TO_DOUBLE(sc);
evas_obj_scale_set(ep->object, base_s);
efl_canvas_object_scale_set(ep->object, base_s);
efl_canvas_text_size_native_get(ep->object, &tw, &th);
orig_s = base_s;
@ -1503,7 +1503,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 * TO_INT(params->eval.w) / tw);
evas_obj_scale_set(ep->object, orig_s);
efl_canvas_object_scale_set(ep->object, orig_s);
efl_canvas_text_size_native_get(ep->object, &tw, &th);
}
if (chosen_desc->text.fit_x)
@ -1512,7 +1512,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
{
s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw);
evas_obj_scale_set(ep->object, s);
efl_canvas_object_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, NULL, NULL);
}
}
@ -1529,7 +1529,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
s = tmp_s;
}
evas_obj_scale_set(ep->object, s);
efl_canvas_object_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, NULL, NULL);
}
}
@ -1554,7 +1554,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
break;
s = tmp_s;
evas_obj_scale_set(ep->object, s);
efl_canvas_object_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, &fw, &fh);
i--;
}
@ -5015,8 +5015,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
else map_obj = mo;
if (map_obj)
{
evas_obj_map_set(map_obj, map);
evas_obj_map_enable_set(map_obj, EINA_TRUE);
efl_canvas_object_map_set(map_obj, map);
efl_canvas_object_map_enable_set(map_obj, EINA_TRUE);
}
}
else
@ -5027,8 +5027,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
{
if (ep->nested_smart) /* Cancel map of smart obj holding nested parts */
{
evas_obj_map_enable_set(ep->nested_smart, EINA_FALSE);
evas_obj_map_set(ep->nested_smart, NULL);
efl_canvas_object_map_enable_set(ep->nested_smart, EINA_FALSE);
efl_canvas_object_map_set(ep->nested_smart, NULL);
}
else
{
@ -5038,8 +5038,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
#endif
if (mo)
{
evas_obj_map_enable_set(mo, 0);
evas_obj_map_set(mo, NULL);
efl_canvas_object_map_enable_set(mo, 0);
efl_canvas_object_map_set(mo, NULL);
}
#ifdef HAVE_EPHYSICS
}

6
src/lib/edje/edje_callbacks.c
View File

@ -430,7 +430,7 @@ _edje_pending_timer_cb(void *data)
}
EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
{ EVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb },
{ EFL_CANVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb },
{ EFL_EVENT_POINTER_IN, _edje_mouse_in_signal_cb },
{ EFL_EVENT_POINTER_OUT, _edje_mouse_out_signal_cb },
{ EFL_EVENT_POINTER_DOWN, _edje_mouse_down_signal_cb },
@ -439,8 +439,8 @@ EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
{ EFL_EVENT_POINTER_WHEEL, _edje_mouse_wheel_signal_cb });
EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks,
{ EVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb },
{ EVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb });
{ EFL_CANVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb },
{ EFL_CANVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb });
void
_edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)

6
src/lib/edje/edje_load.c
View File

@ -892,7 +892,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
}
if (ep->no_render)
evas_obj_no_render_set(rp->object, 1);
efl_canvas_object_no_render_set(rp->object, 1);
if (st_nested && st_nested->nested_children_count) /* Add this to list of children */
{
@ -945,8 +945,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
evas_object_pass_events_set(rp->object, 1);
evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
}
evas_obj_anti_alias_set(rp->object, ep->anti_alias);
evas_obj_precise_is_inside_set(rp->object, ep->precise_is_inside);
efl_canvas_object_anti_alias_set(rp->object, ep->anti_alias);
efl_canvas_object_precise_is_inside_set(rp->object, ep->precise_is_inside);
}
if (rp->part->clip_to_id < 0)
evas_object_clip_set(rp->object, ed->base->clipper);

16
src/lib/edje/edje_lua2.c
View File

@ -1516,7 +1516,7 @@ _elua_text_class(lua_State *L) // Stack usage [-(6|8), +(7|9), emv]
//-------------
static void
_elua_evas_obj_free(void *obj)
_elua_efl_canvas_object_free(void *obj)
{
Edje_Lua_Evas_Object *elo = obj;
@ -1559,7 +1559,7 @@ _elua_polish_evas_object(Edje *ed, Edje_Lua_Evas_Object *elo)
static int
_elua_edje(lua_State *L) // Stack usage [-7, +8, em]
{
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_edje_meta, _elua_evas_obj_free)
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_edje_meta, _elua_efl_canvas_object_free)
// Stack usage [-7, +8, em]
elo->evas_obj = edje_object_add(evas_object_evas_get(ed->obj));
_edje_subobj_register(ed, elo->evas_obj);
@ -1582,7 +1582,7 @@ _elua_edje(lua_State *L) // Stack usage [-7, +8, em]
static int
_elua_image(lua_State *L) // Stack usage [-7, +8, em]
{
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_image_meta, _elua_evas_obj_free)
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_image_meta, _elua_efl_canvas_object_free)
// Stack usage [-7, +8, em]
elo->evas_obj = evas_object_image_filled_add(evas_object_evas_get(ed->obj));
_elua_polish_evas_object(ed, elo);
@ -1604,7 +1604,7 @@ _elua_image(lua_State *L) // Stack usage [-7, +8, em]
static int
_elua_line(lua_State *L) // Stack usage [-7, +8, em]
{
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_line_meta, _elua_evas_obj_free)
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_line_meta, _elua_efl_canvas_object_free)
// Stack usage [-7, +8, em]
elo->evas_obj = evas_object_line_add(evas_object_evas_get(ed->obj));
_elua_polish_evas_object(ed, elo);
@ -1656,7 +1656,7 @@ _elua_map(lua_State *L) // Stack usage [-7, +8, emv]
static int
_elua_polygon(lua_State *L) // Stack usage [-7, +8, em]
{
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_polygon_meta, _elua_evas_obj_free)
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_polygon_meta, _elua_efl_canvas_object_free)
// Stack usage [-7, +8, em]
elo->evas_obj = evas_object_polygon_add(evas_object_evas_get(ed->obj));
_elua_polish_evas_object(ed, elo);
@ -1676,7 +1676,7 @@ _elua_polygon(lua_State *L) // Stack usage [-7, +8, em]
static int
_elua_rect(lua_State *L) // Stack usage [-7, +8, em]
{
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_meta, _elua_evas_obj_free)
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_meta, _elua_efl_canvas_object_free)
// Stack usage [-7, +8, em]
elo->evas_obj = evas_object_rectangle_add(evas_object_evas_get(ed->obj));
_elua_polish_evas_object(ed, elo);
@ -1698,7 +1698,7 @@ _elua_rect(lua_State *L) // Stack usage [-7, +8, em]
static int
_elua_text(lua_State *L) // Stack usage [-7, +8, em]
{
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_text_meta, _elua_evas_obj_free)
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_text_meta, _elua_efl_canvas_object_free)
// Stack usage [-7, +8, em]
elo->evas_obj = evas_object_text_add(evas_object_evas_get(ed->obj));
_elua_polish_evas_object(ed, elo);
@ -1708,7 +1708,7 @@ _elua_text(lua_State *L) // Stack usage [-7, +8, em]
/* XXX: disabled until there are enough textblock functions implemented to make it actually useful
_elua_textblock(lua_State *L) // Stack usage [-7, +8, em]
{
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_textblock_meta, _elua_evas_obj_free)
_ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_textblock_meta, _elua_efl_canvas_object_free)
// Stack usage [-7, +8, em]
elo->evas_obj = evas_object_textblock_add(evas_object_evas_get(ed->obj));
_elua_polish_evas_object(ed, elo);

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

@ -898,7 +898,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
Note: Almost all swallow rules apply: you should not move, resize,
hide, show, set the color or clipper of such part. It's a bit
more restrictive as one must never delete this object!]]
return: Evas.Object; [[The externally created object, or $null if there is none or
return: Efl.Canvas.Object; [[The externally created object, or $null if there is none or
part is not an external.]]
params {
@in part: string; [[The part name]]
@ -915,7 +915,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
content: string; [[A string identifying which content from the EXTERNAL to get]]
}
values {
v: Evas.Object;
v: Efl.Canvas.Object;
}
}
preload {
@ -1113,7 +1113,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
Note: If the type of Edje part is GROUP, SWALLOW or EXTERNAL,
returned handle by this function will indicate nothing or transparent
rectangle for events. Use $.part_swallow_get() in that case.]]
return: const(Evas.Object); [[A pointer to the Evas object implementing the given part,
return: const(Efl.Canvas.Object); [[A pointer to the Evas object implementing the given part,
or $null on failure (e.g. the given part doesn't exist)]]
params {
@in part: string; [[The Edje part's name]]
@ -1999,7 +1999,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.dbg_info_get;
Evas.Object.paragraph_direction.set;
Efl.Canvas.Object.paragraph_direction.set;
Efl.Canvas.Group.group_hide;
Efl.Canvas.Group.group_show;
Efl.Canvas.Group.group_move;

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

@ -39,7 +39,7 @@
# include <Evil.h>
#endif
#define EVAS_OBJECT_PROTECTED
#define EFL_CANVAS_OBJECT_PROTECTED
#include <Eina.h>
#include <Eet.h>

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

@ -35,7 +35,7 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
ed->duration_scale = 1.0;
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
_edje_lib_ref();
parent = eo_parent_get(obj);
@ -343,7 +343,7 @@ _edje_object_efl_canvas_group_group_no_render_set(Eo *obj, Edje *ed, Eina_Bool h
Edje *edg;
efl_canvas_group_no_render_set(eo_super(obj, MY_CLASS), hide);
if (evas_obj_no_render_get(obj) == hide) return;
if (efl_canvas_object_no_render_get(obj) == hide) return;
EINA_LIST_FOREACH(ed->groups, l, edg)
if (edg != ed) efl_canvas_group_no_render_set(edg->obj, hide);
@ -467,9 +467,9 @@ edje_object_file_get(const Edje_Object *obj, const char **file, const char **gro
}
EOLIAN static void
_edje_object_evas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir)
_edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir)
{
evas_obj_paragraph_direction_set(eo_super(obj, MY_CLASS), dir);
efl_canvas_object_paragraph_direction_set(eo_super(obj, MY_CLASS), dir);
/* Make it dirty to recalculate edje.
It needs to move text objects according to new paragraph direction */

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

@ -331,7 +331,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_properties_font_set(ep->object, font, size);
efl_text_set(ep->object, text);
@ -345,7 +345,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_properties_font_set(ep->object, font, size);
@ -367,7 +367,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_properties_font_set(ep->object, font, size);
efl_text_set(ep->object, text);
@ -390,7 +390,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_properties_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
@ -402,7 +402,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
int current;
if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_properties_font_set(ep->object, font, 10);
part_get_geometry(ep, &tw, &th);
@ -424,7 +424,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
current = (top + bottom) / 2;
if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_properties_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th);
@ -440,7 +440,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
current++;
if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_properties_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th);
@ -506,7 +506,7 @@ arrange_text:
if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_properties_font_set(ep->object, font, size);
efl_text_set(ep->object, text);

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

@ -6532,8 +6532,8 @@ _edje_real_part_swallow(Edje *ed,
else
evas_object_pass_events_set(obj_swallow, 1);
_edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp);
evas_obj_anti_alias_set(obj_swallow, rp->part->anti_alias);
evas_obj_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside);
efl_canvas_object_anti_alias_set(obj_swallow, rp->part->anti_alias);
efl_canvas_object_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside);
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;

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

@ -254,7 +254,7 @@ _efl_ui_box_eo_base_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
{
elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME);
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);

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

@ -1874,7 +1874,7 @@ _efl_ui_flip_eo_base_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST);

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

@ -292,7 +292,7 @@ EOLIAN static Eo *
_efl_ui_grid_eo_base_constructor(Eo *obj, Efl_Ui_Grid_Data *pd)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME);
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
pd->dir1 = EFL_ORIENT_RIGHT;

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

@ -9,7 +9,7 @@ _efl_ui_grid_static_eo_base_constructor(Eo *obj, void *pd EINA_UNUSED)
Efl_Ui_Grid_Data *gd;
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME);
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS);

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

@ -877,7 +877,7 @@ EOLIAN static Eo *
_efl_ui_image_eo_base_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);

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

@ -35,7 +35,7 @@ EOLIAN static Eo_Base *
_efl_ui_nstate_eo_base_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME);
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
//TODO: Add ATSPI call here

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

@ -4081,7 +4081,7 @@ EOLIAN static Eo *
_efl_ui_text_eo_base_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);

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

@ -4279,7 +4279,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
eo_parent_set(obj, ecore_evas_get(tmp_sd.ee));
eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
if (getenv("ELM_FIRST_FRAME"))

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

@ -47,7 +47,7 @@ enum Efl.Ui.Win.Type
just like any other object would be, and do other things
like applying \@ref Evas_Map effects to it. This is the only
type of window that requires the parent parameter of
\@ref elm_win_add to be a valid @Evas.Object.]]
\@ref elm_win_add to be a valid @Efl.Canvas.Object.]]
socket_image, [[The window is rendered onto an image buffer and can be shown
other process's plug image object. No actual window is
created for this type, instead the window and all of its
@ -401,7 +401,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
@endcode
*/
values {
icon: Evas.Object @nullable; [[The Evas image object to use for an icon.]]
icon: Efl.Canvas.Object @nullable; [[The Evas image object to use for an icon.]]
}
}
get {
@ -411,7 +411,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
the object to use for the window icon.
]]
values {
icon: const(Evas.Object) @nullable; [[The Evas image object to use for an icon.]]
icon: const(Efl.Canvas.Object) @nullable; [[The Evas image object to use for an icon.]]
}
}
}

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

@ -415,7 +415,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
sd->first_filter = EINA_TRUE;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);

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

@ -1177,7 +1177,7 @@ EOLIAN static Eo *
_elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);

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

@ -2017,7 +2017,7 @@ _elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER);

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

@ -275,7 +275,7 @@ _elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Da
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);

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

@ -389,7 +389,7 @@ EOLIAN static Eo *
_elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING);

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

@ -615,7 +615,7 @@ EOLIAN static Eo *
_elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);

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

@ -1702,7 +1702,7 @@ EOLIAN static Eo *
_elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);

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

@ -1593,7 +1593,7 @@ _elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST);

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

@ -680,7 +680,7 @@ EOLIAN static Eo *
_elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);

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

@ -1614,7 +1614,7 @@ EOLIAN static Eo *
_elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);

2
src/lib/elementary/elementary_config.h
View File

@ -8,4 +8,4 @@
*/
#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme"
#define EVAS_OBJECT_PROTECTED
#define EFL_CANVAS_OBJECT_PROTECTED

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

@ -1245,7 +1245,7 @@ EOLIAN static Eo *
_elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
return obj;
}

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

@ -540,7 +540,7 @@ EOLIAN static Eo *
_elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);

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

@ -44,7 +44,7 @@ class Elm.App.Server.View (Eo.Base)
set {
}
values {
win: Evas.Object;
win: Efl.Canvas.Object;
}
}
@property id {

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

@ -123,7 +123,7 @@ _elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
{
elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED);
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
return obj;
}

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

@ -438,7 +438,7 @@ _elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
{
elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);

16
src/lib/elementary/elm_box.eo
View File

@ -139,7 +139,7 @@ class Elm.Box (Elm.Widget)
You must free this list with eina_list_free() once you are done with it.
]]
return: free(own(list<Evas.Object>), eina_list_free) @warn_unused;
return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
}
}
pack_end {
@ -160,7 +160,7 @@ class Elm.Box (Elm.Widget)
]]
params {
@in subobj: Evas.Object; [[The object to add to the box]]
@in subobj: Efl.Canvas.Object; [[The object to add to the box]]
}
}
unpack_all {
@ -188,7 +188,7 @@ class Elm.Box (Elm.Widget)
]]
params {
@in subobj: Evas.Object; [[The object to unpack]]
@in subobj: Efl.Canvas.Object; [[The object to unpack]]
}
}
pack_after {
@ -209,8 +209,8 @@ class Elm.Box (Elm.Widget)
]]
params {
@in subobj: Evas.Object; [[The object to add to the box]]
@in after: Evas.Object; [[The object after which to add it]]
@in subobj: Efl.Canvas.Object; [[The object to add to the box]]
@in after: Efl.Canvas.Object; [[The object after which to add it]]
}
}
pack_start {
@ -232,7 +232,7 @@ class Elm.Box (Elm.Widget)
]]
params {
@in subobj: Evas.Object; [[The object to add to the box]]
@in subobj: Efl.Canvas.Object; [[The object to add to the box]]
}
}
recalculate {
@ -265,8 +265,8 @@ class Elm.Box (Elm.Widget)
]]
params {
@in subobj: Evas.Object; [[The object to add to the box]]
@in before: Evas.Object; [[The object before which to add it]]
@in subobj: Efl.Canvas.Object; [[The object to add to the box]]
@in before: Efl.Canvas.Object; [[The object before which to add it]]
}
}
clear {

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

@ -228,7 +228,7 @@ EOLIAN static Eo *
_elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);

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

@ -335,7 +335,7 @@ EOLIAN static Eo *
_elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);

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

@ -1593,7 +1593,7 @@ _elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd)
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CALENDAR);

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

@ -367,7 +367,7 @@ EOLIAN static Eo *
_elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX);

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

@ -798,7 +798,7 @@ EOLIAN static Eo *
_elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT);

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

@ -2216,7 +2216,7 @@ EOLIAN static Eo *
_elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER);

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

@ -995,7 +995,7 @@ EOLIAN static Eo *
_elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);

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

@ -63,7 +63,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
]]
}
values {
parent: Evas.Object; [[The parent to use.]]
parent: Efl.Canvas.Object; [[The parent to use.]]
}
}
@property direction_priority {
@ -175,7 +175,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
params {
@in label: string; [[The Label of the new item]]
@in icon: Evas.Object @optional; [[Icon to be set on new item]]
@in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item]]
@in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
@in data: const(void_ptr) @optional; [[Data passed to $func]]
}
@ -194,7 +194,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
params {
@in label: string; [[The Label of the new item]]
@in icon: Evas.Object @optional; [[Icon to be set on new item]]
@in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item]]
@in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
@in data: const(void_ptr) @optional; [[Data passed to $func]]
}

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

@ -892,7 +892,7 @@ EOLIAN static Eo *
_elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR);

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

@ -461,7 +461,7 @@ EOLIAN static Eo *
_elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);

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

@ -1463,7 +1463,7 @@ EOLIAN static Eo *
_elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);

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

@ -179,7 +179,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
return: Elm.Widget.Item;
params {
@in label: string; [[The label of the diskselector item.]]
@in icon: Evas.Object @optional; [[The icon object to use at left side of the item. An
@in icon: Efl.Canvas.Object @optional; [[The icon object to use at left side of the item. An
icon can be any Evas object, but usually it is an icon created
with elm_icon_add(). ]]
@in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]

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

@ -3951,7 +3951,7 @@ EOLIAN static Eo *
_elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);

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

@ -381,7 +381,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
]]
}
values {
parent: Evas.Object @nullable; [[The object to use as parent for the hover.]]
parent: Efl.Canvas.Object @nullable; [[The object to use as parent for the hover.]]
}
}
@property prediction_allow {
@ -574,7 +574,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
change the internal textblock object). This applies to all cursors
returned from textblock calls, and all the other derivative values.
]]
return: Evas.Object;
return: Efl.Canvas.Object;
}
}
@property cursor_geometry {

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

@ -670,7 +670,7 @@ _elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);

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

@ -202,7 +202,7 @@ EOLIAN static Eo *
_elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME);

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

@ -4357,7 +4357,7 @@ _elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd)
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TREE_TABLE);

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

@ -201,7 +201,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item)
floating "orphans" that can be re-used elsewhere if the user wants
to.]]
params {
@out l: own(list<own(Evas.Object)>); [[The contents list to return.]]
@out l: own(list<own(Efl.Canvas.Object)>); [[The contents list to return.]]
}
}
}

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

@ -5708,7 +5708,7 @@ _elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd)
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);

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

@ -326,7 +326,7 @@ class Elm.Genlist.Item(Elm.Widget.Item)
elsewhere if the user wants to.
]]
params {
@out l: own(list<own(Evas.Object)>); [[The contents list to return.]]
@out l: own(list<own(Efl.Canvas.Object)>); [[The contents list to return.]]
}
}
update {

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

@ -3825,7 +3825,7 @@ EOLIAN static Eo *
_elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
return obj;
}

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

@ -121,7 +121,7 @@ class Elm.Gesture_Layer (Elm.Widget)
]]
return: bool; [[$true on success, $false otherwise.]]
params {
@in target: Evas.Object; [[The object to attach.]]
@in target: Efl.Canvas.Object; [[The object to attach.]]
}
}
cb_del {

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

@ -358,7 +358,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
((version > 0) && (version <= 3)) ? version : EVAS_GL_GLES_2_X;
_elm_glview_constructor(obj, sd);
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);

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

@ -169,7 +169,7 @@ EOLIAN static Eo *
_elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
return obj;

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

@ -25,7 +25,7 @@ class Elm.Grid (Elm.Widget)
It's possible to remove objects from the grid when walking this
list, but these removals won't be reflected on it.
]]
return: free(own(list<Evas.Object>), eina_list_free) @warn_unused;
return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
}
}
clear {
@ -37,13 +37,13 @@ class Elm.Grid (Elm.Widget)
unpack {
[[Unpack a child from a grid object]]
params {
@in subobj: Evas.Object; [[The child to unpack]]
@in subobj: Efl.Canvas.Object; [[The child to unpack]]
}
}
pack {
[[Pack child at given position and size]]
params {
@in subobj: Evas.Object; [[The child to pack.]]
@in subobj: Efl.Canvas.Object; [[The child to pack.]]
@in x: Evas.Coord; [[The virtual x coord at which to pack it.]]
@in y: Evas.Coord; [[The virtual y coord at which to pack it.]]
@in w: Evas.Coord; [[The virtual width at which to pack it.]]

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

@ -671,7 +671,7 @@ EOLIAN static Eo *
_elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);

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

@ -25,7 +25,7 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action
[[Get the target object for the hover.]]
}
values {
target: Evas.Object; [[The target object.]]
target: Efl.Canvas.Object; [[The target object.]]
}
}
best_content_location_get @const {

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

@ -30,7 +30,7 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
get {
}
values {
parent: Evas.Object @nullable; [[The parent to use]]
parent: Efl.Canvas.Object @nullable; [[The parent to use]]
}
}
@property expanded {

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

@ -617,7 +617,7 @@ _elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd)
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);

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

@ -1259,7 +1259,7 @@ EOLIAN static Eo *
_elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR);

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

@ -234,7 +234,7 @@ EOLIAN static Eo *
_elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_PAN_CLASS));
evas_obj_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
return obj;

8
src/lib/elementary/elm_interface_scrollable.eo
View File

@ -382,7 +382,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
set {
}
values {
pan: Evas.Object @nullable;
pan: Efl.Canvas.Object @nullable;
}
}
@property page_change_cb {
@ -467,7 +467,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
set {
}
values {
content: Evas.Object @nullable;
content: Efl.Canvas.Object @nullable;
}
}
@property edge_left_cb {
@ -522,8 +522,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
set {
}
values {
edje_object: Evas.Object;
hit_rectangle: Evas.Object;
edje_object: Efl.Canvas.Object;
hit_rectangle: Efl.Canvas.Object;
}
}
@property last_page {

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

@ -116,7 +116,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
}
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
return obj;

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

@ -414,7 +414,7 @@ EOLIAN static Eo *
_elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL);

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

@ -1899,7 +1899,7 @@ _elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
{
sd->obj = obj;
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);

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

@ -94,7 +94,7 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File)
hooking callbacks to signals, etc.) can be done with
proper elementary functions.
]]
return: Evas.Object; [[An Evas_Object with the edje layout
return: Efl.Canvas.Object; [[An Evas_Object with the edje layout
settings loaded \@ref elm_layout_file_set.]]
}
}

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

@ -2553,7 +2553,7 @@ EOLIAN static Eo *
_elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);

20
src/lib/elementary/elm_list.eo
View File

@ -228,8 +228,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
params {
@in before: Elm.Widget.Item; [[The list item to insert before.]]
@in label: string; [[The label of the list item.]]
@in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
@in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
}
@ -275,8 +275,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
params {
@in after: Elm.Widget.Item; [[The list item to insert after.]]
@in label: string; [[The label of the list item.]]
@in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
@in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
}
@ -345,8 +345,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
params {
@in label: string; [[The label of the list item.]]
@in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
@in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
}
@ -376,8 +376,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
params {
@in label: string; [[The label of the list item.]]
@in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
@in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
}
@ -414,8 +414,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
params {
@in label: string; [[The label of the list item.]]
@in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
@in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
@in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
@in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
@in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort list

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

@ -53,7 +53,7 @@ class Elm.List.Item(Elm.Widget.Item)
]]
}
values {
obj: Evas.Object; [[The base Edje object associated with the item.]]
obj: Efl.Canvas.Object; [[The base Edje object associated with the item.]]
}
}
@property prev {

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

@ -4236,7 +4236,7 @@ _elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd)
obj = eo_constructor(eo_super(obj, MY_CLASS));
sd->obj = obj;
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);

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

@ -348,7 +348,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
}
track_add {
[[Add a track on the map.]]
return: Evas.Object; [[The route object. This is an elm object of type Route.]]
return: Efl.Canvas.Object; [[The route object. This is an elm object of type Route.]]
params {
@in emap: void_ptr; [[The emap route object.]]
}
@ -547,7 +547,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
track_remove {
[[Remove a track from the map.]]
params {
@in route: Evas.Object; [[The track to remove.]]
@in route: Efl.Canvas.Object; [[The track to remove.]]
}
}
overlay_route_add {

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

@ -316,7 +316,7 @@ EOLIAN static Eo *
_elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);
return obj;

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

@ -786,7 +786,7 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
Eo *parent = NULL;
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
parent = eo_parent_get(obj);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU);

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

@ -69,7 +69,7 @@ class Elm.Menu.Item(Elm.Widget.Item, Elm.Interface.Atspi.Selection)
Warning: Don't manipulate this object!
]]
return: Evas.Object; [[The base Edje object containing the
return: Efl.Canvas.Object; [[The base Edje object containing the
swallowed content associated with the item.]]
}
}

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

@ -71,7 +71,7 @@ class Elm.Multibuttonentry (Elm.Layout)
get {
[[Get the entry of the multibuttonentry object]]
return: Evas.Object; [[The entry object, or NULL if none]]
return: Efl.Canvas.Object; [[The entry object, or NULL if none]]
}
}
@property selected_item {

22
src/lib/elementary/elm_naviframe.eo
View File

@ -73,7 +73,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
is complete.
]]
return: Evas.Object; [[$NULL or the content object(if the elm_naviframe_content_preserve_on_pop_get is true).]]
return: Efl.Canvas.Object; [[$NULL or the content object(if the elm_naviframe_content_preserve_on_pop_get is true).]]
}
item_insert_before {
[[Insert a new item into the naviframe before item $before.
@ -85,9 +85,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
params {
@in before: Elm.Widget.Item; [[The naviframe item to insert before.]]
@in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
@in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
@in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
@in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
@in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
@in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
@in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
@in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
}
}
@ -106,9 +106,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
params {
@in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
@in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
@in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
@in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
@in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
@in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
@in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
@in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
}
}
@ -116,7 +116,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
[[Simple version of item_promote.]]
params {
@in content: Evas.Object;
@in content: Efl.Canvas.Object;
}
}
item_insert_after {
@ -132,9 +132,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
params {
@in after: Elm.Widget.Item; [[The naviframe item to insert after.]]
@in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
@in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
@in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
@in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
@in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
@in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
@in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
@in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
}
}

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

@ -494,7 +494,7 @@ EOLIAN static Eo *
_elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
return obj;

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

@ -1174,7 +1174,7 @@ EOLIAN static Eo *
_elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);

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

@ -331,7 +331,7 @@ EOLIAN static Eo *
_elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE);

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

@ -304,7 +304,7 @@ EOLIAN static Eo *
_elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);

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

@ -1511,7 +1511,7 @@ EOLIAN static Eo *
_elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);

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

@ -134,7 +134,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
modify it. It is for inspection only, and hooking callbacks
to. Nothing else. It may be deleted at any time as well.
]]
return: Evas.Object; [[The internal image object handle or $null]]
return: Efl.Canvas.Object; [[The internal image object handle or $null]]
}
}
@property image_size {

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

@ -144,7 +144,7 @@ EOLIAN static Eo *
_elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);

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

@ -16,7 +16,7 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
Note: Be careful to not manipulate it, as it is under control of
elementary.
]]
return: Evas.Object; [[The inlined image object or $null.]]
return: Efl.Canvas.Object; [[The inlined image object or $null.]]
}
}
connect {

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

@ -153,7 +153,7 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
params {
@in label: string; [[The Label of the new item.]]
@in icon: Evas.Object @optional; [[Icon to be set on new item.]]
@in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item.]]
@in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected.]]
@in data: const(void_ptr) @optional; [[Data passed to $func above.]]
}

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

@ -516,7 +516,7 @@ EOLIAN static Eo *
_elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT);

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

@ -119,7 +119,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
@since 1.8]]
return: const(Evas.Object); [[A valid widget handle, on success, or $NULL, otherwise]]
return: const(Efl.Canvas.Object); [[A valid widget handle, on success, or $NULL, otherwise]]
params {
@in name: string; [[The name of the item (as declared in the prefs collection) to get object from]]
}
@ -151,7 +151,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
return: bool; [[$true, on success, $false otherwise]]
params {
@in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]]
@in child: Evas.Object; [[The object to occupy the item]]
@in child: Efl.Canvas.Object; [[The object to occupy the item]]
}
}
item_editable_set {
@ -182,7 +182,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
@since 1.8]]
return: Evas.Object; [[The unswallowed object, or NULL on errors]]
return: Efl.Canvas.Object; [[The unswallowed object, or NULL on errors]]
params {
@in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]]
}

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

@ -359,7 +359,7 @@ EOLIAN static Eo *
_elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR);

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

@ -276,7 +276,7 @@ EOLIAN static Eo *
_elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON);

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

@ -57,7 +57,7 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
@property selected_object {
get {
[[Get the selected radio object.]]
return: Evas.Object; [[The selected radio object]]
return: Efl.Canvas.Object; [[The selected radio object]]
}
}
group_add {

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

@ -186,7 +186,7 @@ EOLIAN static Eo *
_elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
return obj;
}

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