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

widget: rename elm widget to Efl.Ui.Widget.

This commit is contained in:
Amitesh Singh 2018-01-08 13:55:35 +09:00
parent ade2c9ed52
commit 44d3227beb
167 changed files with 659 additions and 658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/POTFILES.in
View File

@ -174,7 +174,7 @@ src/lib/elementary/elm_transit.c
src/lib/elementary/elm_util.c
src/lib/elementary/efl_ui_video.c
src/lib/elementary/elm_web2.c
src/lib/elementary/elm_widget.c
src/lib/elementary/efl_ui_widget.c
src/lib/elementary/efl_ui_win.c
src/lib/elementary/els_box.c
src/lib/elementary/els_cursor.c

4
src/Makefile_Elementary.am
View File

@ -2,7 +2,7 @@
### Library
elm_public_eolian_files = \
lib/elementary/elm_widget.eo \
lib/elementary/efl_ui_widget.eo \
lib/elementary/efl_ui_bg.eo \
lib/elementary/efl_ui_bg_widget.eo \
lib/elementary/efl_ui_button.eo \
@ -711,7 +711,7 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_view_list.c \
lib/elementary/elm_view_form.c \
lib/elementary/elm_web2.c \
lib/elementary/elm_widget.c \
lib/elementary/efl_ui_widget.c \
lib/elementary/efl_ui_win.c \
lib/elementary/efl_ui_win_inlined.c \
lib/elementary/efl_ui_win_socket.c \

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

@ -277,7 +277,7 @@ EAPI extern Elm_Version *elm_version;
#ifdef EFL_EO_API_SUPPORT
# include <efl_ui_list_segarray.h>
# include <efl_config_global.eo.h>
# include <elm_widget.eo.h>
# include <efl_ui_widget.eo.h>
# include <efl_ui_widget_part.eo.h>
# include <efl_ui_widget_part_bg.eo.h>
# include <efl_ui_widget_part_shadow.eo.h>

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

@ -49,7 +49,7 @@ _efl_access_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void
Elm_Config_Binding_Key *binding;
int tmp = 0;
if (!efl_isa(obj, ELM_WIDGET_CLASS))
if (!efl_isa(obj, EFL_UI_WIDGET_CLASS))
return NULL;
actions = efl_access_widget_action_elm_actions_get(obj);

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

@ -1,4 +1,4 @@
class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout,
class Efl.Ui.Box (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Pack.Layout,
Efl.Ui.Direction)
{
[[The box widget.

6
src/lib/elementary/efl_ui_button.c
View File

@ -88,7 +88,7 @@ _efl_ui_button_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS
}
EOLIAN static Eina_Bool
_efl_ui_button_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
_efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
{
if (elm_widget_disabled_get(obj)) return EINA_FALSE;
if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
@ -121,7 +121,7 @@ _icon_signal_emit(Evas_Object *obj)
* is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
* can changed the theme API */
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
_efl_ui_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -136,7 +136,7 @@ _efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS
* is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
* can changed the theme API */
EOLIAN static Eina_Bool
_efl_ui_button_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj)
_efl_ui_button_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
Eina_Bool int_ret = EINA_FALSE;

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

@ -15,10 +15,10 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
Efl.Ui.Autorepeat.autorepeat_gap_timeout { set; get; }
Efl.Ui.Autorepeat.autorepeat_enabled { set; get; }
Efl.Ui.Autorepeat.autorepeat_supported { get;}
Elm.Widget.on_access_activate;
Elm.Widget.theme_apply;
Elm.Widget.widget_sub_object_del;
Elm.Widget.widget_event;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Part.part;
Efl.Content.content { get; set; }

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

@ -528,7 +528,7 @@ _spinner_buttons_add(Evas_Object *obj, Efl_Ui_Calendar_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_calendar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd)
_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -863,7 +863,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
}
EOLIAN static Eina_Bool
_efl_ui_calendar_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Calendar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_calendar_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Calendar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
@ -957,7 +957,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
_efl_ui_calendar_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs)
_efl_ui_calendar_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs)
{
_efl_ui_calendar_smart_focus_next_enable = acs;
_access_obj_process(obj, _efl_ui_calendar_smart_focus_next_enable);

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

@ -106,10 +106,10 @@ class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widge
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Canvas.Group.group_calculate;
Elm.Widget.theme_apply;
Elm.Widget.on_access_update;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Ui.Format.format_cb { set; }
}

6
src/lib/elementary/efl_ui_check.c
View File

@ -117,7 +117,7 @@ _efl_ui_check_efl_access_state_set_get(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUS
* is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
* can changed the theme API */
EOLIAN static Eina_Bool
_efl_ui_check_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *sobj)
_efl_ui_check_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
Eina_Bool int_ret = EINA_FALSE;
@ -132,7 +132,7 @@ _efl_ui_check_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd E
}
EOLIAN static Eina_Bool
_efl_ui_check_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
_efl_ui_check_efl_ui_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
{
if (elm_widget_disabled_get(obj)) return EINA_FALSE;
if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
@ -150,7 +150,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -23,10 +23,10 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Efl.Access.Widget.Action)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.on_access_activate;
Elm.Widget.theme_apply;
Elm.Widget.widget_sub_object_del;
Elm.Widget.widget_event;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;
Efl.Ui.Nstate.count { set; }
Efl.Ui.Nstate.value { set; }
Efl.Access.state_set { get; }

6
src/lib/elementary/efl_ui_clock.c
View File

@ -449,7 +449,7 @@ _efl_ui_clock_edit_mode_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd)
}
EOLIAN static Eina_Bool
_efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_clock_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
@ -466,7 +466,7 @@ _efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Obj
}
EOLIAN static Eina_Bool
_efl_ui_clock_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina_Bool disabled)
_efl_ui_clock_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina_Bool disabled)
{
Clock_Field *field;
unsigned int idx = 0;
@ -501,7 +501,7 @@ _efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -224,9 +224,9 @@ class Efl.Ui.Clock (Efl.Ui.Layout)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Elm.Widget.on_disabled_update;
Elm.Widget.on_focus_update;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Translatable.translation_update;
}
events {

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

@ -98,7 +98,7 @@ _sizing_eval(Evas_Object *obj)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
@ -119,7 +119,7 @@ _changed_size_hints_cb(void *data,
}
EOLIAN static Eina_Bool
_efl_ui_flip_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EINA_UNUSED, Evas_Object *sobj)
_efl_ui_flip_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
Eina_Bool int_ret = EINA_FALSE;
@ -139,7 +139,7 @@ _efl_ui_flip_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EIN
}
EOLIAN static Eina_Bool
_efl_ui_flip_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Flip_Data *sd, Evas_Object *sobj)
_efl_ui_flip_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Flip_Data *sd, Evas_Object *sobj)
{
Eina_Bool int_ret = EINA_FALSE;
@ -1743,7 +1743,7 @@ _flip_content_set(Evas_Object *obj,
//evas_object_smart_member_add(content, obj);
evas_object_clip_set
(content, front ? sd->front.clip : sd->back.clip);
if (efl_isa(content, ELM_WIDGET_CLASS) && sd->state != front)
if (efl_isa(content, EFL_UI_WIDGET_CLASS) && sd->state != front)
elm_widget_tree_unfocusable_set(content, EINA_TRUE);
}
@ -1965,9 +1965,9 @@ _internal_elm_flip_go_to(Evas_Object *obj,
else elm_object_focus_set(sd->back.content, EINA_TRUE);
}
if (sd->front.content && efl_isa(sd->front.content, ELM_WIDGET_CLASS))
if (sd->front.content && efl_isa(sd->front.content, EFL_UI_WIDGET_CLASS))
elm_widget_tree_unfocusable_set(sd->front.content, !front);
if (sd->back.content && efl_isa(sd->back.content, ELM_WIDGET_CLASS))
if (sd->back.content && efl_isa(sd->back.content, EFL_UI_WIDGET_CLASS))
elm_widget_tree_unfocusable_set(sd->back.content, front);

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

@ -26,7 +26,7 @@ enum Efl.Ui.Flip.Interaction
page [[Page interaction]]
}
class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part)
class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Part)
{
[[Efl UI flip class]]
legacy_prefix: elm_flip;
@ -229,9 +229,9 @@ class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.widget_sub_object_add;
Elm.Widget.theme_apply;
Elm.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_sub_object_add;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Container.content_iterate;
Efl.Container.content_count;
Efl.Container.content_remove;

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

@ -96,7 +96,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi
EINA_SAFETY_ON_NULL_GOTO(elem, cont);
if (!efl_isa(elem, ELM_WIDGET_CLASS))
if (!efl_isa(elem, EFL_UI_WIDGET_CLASS))
{
if (efl_isa(elem, EFL_UI_FOCUS_OBJECT_MIXIN))
{
@ -111,7 +111,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi
}
else
{
EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or ELM_WIDGET_CLASS");
EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or EFL_UI_WIDGET_CLASS");
continue;
}
}
@ -130,7 +130,7 @@ _efl_ui_focus_composition_composition_elements_get(Eo *obj EINA_UNUSED, Efl_Ui_F
}
EOLIAN static Eina_Bool
_efl_ui_focus_composition_elm_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_Composition_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect)
_efl_ui_focus_composition_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_Composition_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect)
{
Eina_Bool registered;

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

@ -1,4 +1,4 @@
mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) {
mixin Efl.Ui.Focus.Composition (Efl.Interface, Efl.Ui.Widget) {
[[This defines the inheriting widget as Composition widget.
A composition widget is a widget that's the logical parent of another set of widgets which can be used for interaction.
@ -7,13 +7,13 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) {
@property composition_elements @protected {
[[Set the order of elements that will be used for composition
Elements of the list can be either an Elm.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.Ui.Focus.Object, then the mixin will take care of registering the element.
If the element is a Elm.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 {
logical_order : list<Efl.Gfx> @owned; [[The order to use]]
@ -50,7 +50,7 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) {
}
}
implements {
Elm.Widget.focus_state_apply;
Efl.Ui.Widget.focus_state_apply;
Efl.Ui.Focus.Object.prepare_logical;
@empty .prepare;
}

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

@ -17,7 +17,7 @@ typedef struct {
} Efl_Ui_Focus_Layer_Data;
EOLIAN static Efl_Ui_Focus_Manager*
_efl_ui_focus_layer_elm_widget_focus_manager_create(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
_efl_ui_focus_layer_efl_ui_widget_focus_manager_create(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
{
return efl_add(EFL_UI_FOCUS_MANAGER_ROOT_FOCUS_CLASS, obj, efl_ui_focus_manager_root_set(efl_added, root));
}
@ -65,7 +65,7 @@ _efl_ui_focus_layer_efl_ui_focus_user_focus_manager_get(Eo *obj, Efl_Ui_Focus_La
}
EOLIAN static Eina_Bool
_efl_ui_focus_layer_elm_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state EINA_UNUSED, Efl_Ui_Widget_Focus_State *configured_state EINA_UNUSED, Elm_Widget *redirect EINA_UNUSED)
_efl_ui_focus_layer_efl_ui_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state EINA_UNUSED, Efl_Ui_Widget_Focus_State *configured_state EINA_UNUSED, Efl_Ui_Widget *redirect EINA_UNUSED)
{
return EINA_FALSE;
}

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

@ -1,4 +1,4 @@
mixin Efl.Ui.Focus.Layer (Efl.Interface, Elm.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) {
mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) {
[[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.
@ -21,8 +21,8 @@ mixin Efl.Ui.Focus.Layer (Efl.Interface, Elm.Widget, Efl.Gfx, Efl.Ui.Focus.Manag
}
}
implements {
Elm.Widget.focus_manager_create;
Elm.Widget.focus_state_apply;
Efl.Ui.Widget.focus_manager_create;
Efl.Ui.Widget.focus_state_apply;
Efl.Gfx.visible {set;}
Efl.Ui.Focus.Manager.move;
Efl.Ui.Focus.User.focus_manager { get; }

8
src/lib/elementary/efl_ui_focus_parent_provider_gen.c
View File

@ -8,7 +8,7 @@
typedef struct {
Eina_Hash *map;
Elm_Widget *container;
Efl_Ui_Widget *container;
Efl_Ui_Focus_Parent_Provider *provider;
} Efl_Ui_Focus_Parent_Provider_Gen_Data;
@ -27,7 +27,7 @@ _efl_ui_focus_parent_provider_gen_content_item_map_get(Eo *obj EINA_UNUSED, Efl_
}
EOLIAN static void
_efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Elm_Widget *container)
_efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Efl_Ui_Widget *container)
{
EINA_SAFETY_ON_TRUE_RETURN(efl_finalized_get(obj));
@ -38,7 +38,7 @@ _efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Pro
pd->provider = efl_provider_find(efl_parent_get(pd->container), EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE);
}
EOLIAN static Elm_Widget*
EOLIAN static Efl_Ui_Widget*
_efl_ui_focus_parent_provider_gen_container_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd)
{
return pd->container;
@ -53,7 +53,7 @@ _efl_ui_focus_parent_provider_gen_efl_ui_focus_parent_provider_find_logical_pare
if (elm_widget_parent_widget_get(widget) != pd->container)
{
Elm_Widget *parent = elm_widget_parent_widget_get(widget);
Efl_Ui_Widget *parent = elm_widget_parent_widget_get(widget);
//move forward so we get the last widget above the gengrid level, this may be the widget out of the map
do {
above_gengrid = parent;

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

@ -4,13 +4,13 @@ class Efl.Ui.Focus.Parent_Provider.Gen(Efl.Object, Efl.Ui.Focus.Parent_Provider)
@property content_item_map {
[[Content item map property]]
values {
map : hash<Elm.Widget, Elm.Widget.Item>; [[Item map]]
map : hash<Efl.Ui.Widget, Elm.Widget.Item>; [[Item map]]
}
}
@property container {
[[Container property]]
values {
container : Elm.Widget; [[Container widget]]
container : Efl.Ui.Widget; [[Container widget]]
}
}
}

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

@ -18,7 +18,7 @@ _manager_changed(void *data, const Efl_Event *event EINA_UNUSED)
EOLIAN static void
_efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_User *user)
{
Elm_Widget *top, *o;
Efl_Ui_Widget *top, *o;
Efl_Ui_Focus_Manager *m;
m = efl_ui_focus_user_focus_manager_get(user);

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

@ -721,7 +721,7 @@ _efl_ui_image_efl_canvas_object_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Ob
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
_efl_ui_image_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -18,7 +18,7 @@ struct Efl.Ui.Image.Error
open_error: bool; [[$true if the error happened when opening the file, $false otherwise]]
}
class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
Efl.Access.Image, Efl.Access.Widget.Action, Efl.Gfx.Color,
Efl.Orientation, Efl.Flipable,
@ -116,8 +116,8 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
Efl.Ui.Draggable.drag_target { get; set; }
Efl.Ui.Model.Connect.connect;
Efl.Ui.View.model { get; set; }
Elm.Widget.theme_apply;
Elm.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_event;
Efl.Access.Image.extents { get; }
Efl.Access.Widget.Action.elm_actions { get; }
}

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

@ -863,7 +863,7 @@ _mouse_up_cb(void *data,
}
EOLIAN static Eina_Bool
_efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_image_zoomable_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
@ -888,7 +888,7 @@ _efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
_efl_ui_image_zoomable_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
Eina_Bool fdo = EINA_FALSE;

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

@ -1,4 +1,4 @@
class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
Efl.Ui.Scrollable.Interactive,
Efl.Ui.Scrollbar)
{
@ -58,9 +58,9 @@ class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
Efl.Ui.Zoom.zoom { set; get; }
Efl.Ui.Zoom.zoom_mode { set; get; }
Efl.Canvas.Group.group_member_add;
Elm.Widget.theme_apply;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Scrollable.Interactive.scroll;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.File.file { get; set; }

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

@ -335,7 +335,7 @@ _visuals_refresh(Evas_Object *obj,
}
EOLIAN static Eina_Bool
_efl_ui_layout_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled)
_efl_ui_layout_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -378,7 +378,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
_efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
{
Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED;
@ -390,7 +390,7 @@ _efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
}
EOLIAN static Eina_Bool
_efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_layout_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -416,7 +416,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
}
EOLIAN static Eina_Bool
_efl_ui_layout_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj)
_efl_ui_layout_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
Eina_Bool int_ret = EINA_FALSE;
@ -433,7 +433,7 @@ _efl_ui_layout_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd
}
EOLIAN static Eina_Bool
_efl_ui_layout_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj)
_efl_ui_layout_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj)
{
Eina_List *l;
Efl_Ui_Layout_Sub_Object_Data *sub_d;
@ -853,7 +853,7 @@ elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conte
EFL_UI_LAYOUT_CHECK(obj) EINA_FALSE;
if (!swallow)
{
swallow = elm_widget_default_content_part_get(obj);
swallow = efl_ui_widget_default_content_part_get(obj);
if (!swallow) return EINA_FALSE;
}
else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE))
@ -937,7 +937,7 @@ elm_layout_content_get(const Evas_Object *obj, const char *swallow)
EFL_UI_LAYOUT_CHECK(obj) NULL;
if (!swallow)
{
swallow = elm_widget_default_content_part_get(obj);
swallow = efl_ui_widget_default_content_part_get(obj);
if (!swallow) return NULL;
}
else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE))
@ -971,7 +971,7 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow)
EFL_UI_LAYOUT_CHECK(obj) NULL;
if (!swallow)
{
swallow = elm_widget_default_content_part_get(obj);
swallow = efl_ui_widget_default_content_part_get(obj);
if (!swallow) return NULL;
}
else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE))
@ -2222,7 +2222,7 @@ elm_layout_text_set(Eo *obj, const char *part, const char *text)
{
if (!part)
{
part = elm_widget_default_text_part_get(obj);
part = efl_ui_widget_default_text_part_get(obj);
if (!part) return EINA_FALSE;
}
else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
@ -2237,7 +2237,7 @@ elm_layout_text_get(const Eo *obj, const char *part)
{
if (!part)
{
part = elm_widget_default_text_part_get(obj);
part = efl_ui_widget_default_text_part_get(obj);
if (!part) return NULL;
}
else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))

14
src/lib/elementary/efl_ui_layout.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect,
Efl.Layout.Calc, Efl.Layout.Signal,
Efl.Layout.Group)
@ -19,7 +19,7 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
set {
[[Sets the edje group from the elementary theme that will be used
as layout. Note that $style will be the new style of this object,
as in an @Elm.Widget.style. As a consequence this function can
as in an @Efl.Ui.Widget.style. As a consequence this function can
only be called during construction of the object, before finalize.
If this returns $false the widget is very likely to become
@ -59,11 +59,11 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
Efl.Layout.Group.group_data { get; }
Efl.Layout.Group.group_size_min { get; }
Efl.Layout.Group.group_size_max { get; }
Elm.Widget.widget_sub_object_add;
Elm.Widget.theme_apply;
Elm.Widget.on_disabled_update;
Elm.Widget.widget_sub_object_del;
Elm.Widget.on_focus_update;
Efl.Ui.Widget.widget_sub_object_add;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.on_focus_update;
Efl.Container.content_count;
Efl.Container.content_remove;
Efl.Container.content_iterate;

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

@ -667,7 +667,7 @@ _efl_ui_list_efl_canvas_group_group_del(Eo *obj, Efl_Ui_List_Data *pd)
}
EOLIAN static Efl_Ui_Focus_Manager*
_efl_ui_list_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
_efl_ui_list_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
{
if (!pd->manager)
pd->manager = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, obj,

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

@ -85,8 +85,8 @@ class Efl.Ui.List (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable.Interactive, Ef
// Elm.Widget.activate;
// Elm.Widget.focused_item { get; }
// Elm.Widget.focused_object { get; }
Elm.Widget.focus_manager_create;
Elm.Widget.widget_event;
Efl.Ui.Widget.focus_manager_create;
Efl.Ui.Widget.widget_event;
// Efl.Ui.Focus.Manager.focus {set; }
//Efl.Ui.Layout.sizing_eval;

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

@ -91,7 +91,7 @@ _format_count(int count, void *data EINA_UNUSED)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_multibuttonentry_elm_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd)
_efl_ui_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd)
{
const char *str;
int hpad = 0, vpad = 0;
@ -931,7 +931,7 @@ _item_new(Efl_Ui_Multibuttonentry_Data *sd,
//FIXME: having an empty event handling function and reacting on Evas
//events on specific objects is crazy, someone should fix that.
EOLIAN static Eina_Bool
_efl_ui_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED)
_efl_ui_multibuttonentry_efl_ui_widget_widget_event(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED)
{
// ACCESS
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) return EINA_FALSE;
@ -1630,7 +1630,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
_efl_ui_multibuttonentry_elm_widget_on_access_update(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs)
_efl_ui_multibuttonentry_efl_ui_widget_on_access_update(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs)
{
_efl_ui_multibuttonentry_smart_focus_next_enable = acs;
_access_obj_process(obj, _efl_ui_multibuttonentry_smart_focus_next_enable);
@ -1652,12 +1652,12 @@ _legacy_focused(void *data, const Efl_Event *ev)
new_focus = efl_ui_focus_manager_focus_get(ev->object);
if (efl_isa(ev->info, ELM_WIDGET_CLASS) && elm_widget_parent_get(ev->info) == pd->box)
if (efl_isa(ev->info, EFL_UI_WIDGET_CLASS) && elm_widget_parent_get(ev->info) == pd->box)
{
meaningful_focus_out = EINA_TRUE;
}
if (efl_isa(new_focus, ELM_WIDGET_CLASS) && elm_widget_parent_get(new_focus) == pd->box)
if (efl_isa(new_focus, EFL_UI_WIDGET_CLASS) && elm_widget_parent_get(new_focus) == pd->box)
{
meaningful_focus_in = EINA_TRUE;
}

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

@ -162,10 +162,10 @@ class Efl.Ui.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Format)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Elm.Widget.on_access_update;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Translatable.translation_update;
Elm.Widget.widget_event;
Efl.Ui.Widget.widget_event;
Efl.Access.children { get; }
Efl.Part.part;
Efl.Ui.Format.format_cb { set; }

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

@ -116,7 +116,7 @@ _efl_ui_nstate_value_set(Eo *obj, Efl_Ui_Nstate_Data *pd, int state)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -30,8 +30,8 @@ class Efl.Ui.Nstate(Efl.Ui.Button)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Elm.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_event;
}
events {
changed; [[Called when the value changed.]]

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

@ -111,7 +111,7 @@ _efl_ui_panes_theme_group_get(Evas_Object *obj, Efl_Ui_Panes_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
_efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
{
double size;
Evas_Coord minw = 0, minh = 0;

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

@ -47,7 +47,7 @@ class Efl.Ui.Panes (Efl.Ui.Layout, Efl.Ui.Direction,
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] }
Efl.Part.part;
}

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

@ -94,7 +94,7 @@ _parent_geom_cb(void *data, const Efl_Event *ev EINA_UNUSED)
}
EOLIAN static void
_efl_ui_popup_elm_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eo *parent EINA_UNUSED)
_efl_ui_popup_efl_ui_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eo *parent EINA_UNUSED)
{
pd->win_parent = efl_provider_find(obj, EFL_UI_WIN_CLASS);
if (!pd->win_parent)

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

@ -58,7 +58,7 @@ class Efl.Ui.Popup(Efl.Ui.Layout, Efl.Content)
Efl.Gfx.position { set; }
Efl.Gfx.size { set;}
Efl.Gfx.visible { set; }
Elm.Widget.widget_parent { set; }
Efl.Ui.Widget.widget_parent { set; }
Efl.Content.content { get; set; }
Efl.Content.content_unset;
Efl.Part.part;

6
src/lib/elementary/efl_ui_progressbar.c
View File

@ -179,7 +179,7 @@ _icon_signal_emit(Evas_Object *obj)
}
EOLIAN static Eina_Bool
_efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
_efl_ui_progressbar_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
{
if (!efl_ui_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj))
return EINA_FALSE;
@ -189,7 +189,7 @@ _efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar
}
static Eina_Bool
_efl_ui_progressbar_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
_efl_ui_progressbar_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
{
if (!efl_ui_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj))
return EINA_FALSE;
@ -257,7 +257,7 @@ _efl_ui_progressbar_theme_group_get(Evas_Object *obj, Efl_Ui_Progressbar_Data *s
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);

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

@ -50,9 +50,9 @@ class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Elm.Widget.widget_sub_object_add;
Elm.Widget.widget_sub_object_del;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_add;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Range.range_value { get; set; }
Efl.Ui.Direction.direction { get; set; }
Efl.Ui.Format.format_cb { set; }

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

@ -148,7 +148,7 @@ _icon_signal_emit(Evas_Object *obj)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
_efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -325,7 +325,7 @@ _efl_ui_radio_selected_object_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *sd)
}
EOLIAN static Eina_Bool
_efl_ui_radio_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
_efl_ui_radio_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
{
if (elm_widget_disabled_get(obj)) return EINA_FALSE;
if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;

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

@ -62,9 +62,9 @@ class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content)
class.constructor;
Efl.Object.constructor;
Efl.Object.destructor;
Elm.Widget.theme_apply;
Elm.Widget.on_access_activate;
Elm.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.widget_event;
Efl.Access.state_set { get; }
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Content.content { get; set; }

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

@ -514,7 +514,7 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_scroller_elm_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd)
_efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));

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

@ -10,7 +10,7 @@ class Efl.Ui.Scroller (Efl.Ui.Layout,
Efl.Object.finalize;
Efl.Object.destructor;
Efl.Content.content { set; }
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Scrollable.Interactive.content_size{ get; }
Efl.Ui.Scrollable.Interactive.viewport_geometry{ get; }
Efl.Ui.Scrollable.Interactive.bounce_enabled { set; get; }

12
src/lib/elementary/efl_ui_slider.c
View File

@ -526,17 +526,17 @@ _wheel_indicator_timer_cb(void *data)
return ECORE_CALLBACK_CANCEL;
}
// _slider_elm_widget_widget_event
// _slider_efl_ui_widget_widget_event
ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(slider, Efl_Ui_Slider_Data)
EOLIAN static Eina_Bool
_efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
_efl_ui_slider_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
{
Eo *ev = eo_event->info;
if (eo_event->desc == EFL_EVENT_KEY_DOWN)
{
if (!_slider_elm_widget_widget_event(obj, sd, eo_event, src))
if (!_slider_efl_ui_widget_widget_event(obj, sd, eo_event, src))
return EINA_FALSE;
}
else if (eo_event->desc == EFL_EVENT_KEY_UP)
@ -565,7 +565,7 @@ _efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Ef
}
EOLIAN static Eina_Bool
_efl_ui_slider_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Activate act)
_efl_ui_slider_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Activate act)
{
if (elm_widget_disabled_get(obj)) return EINA_FALSE;
if (act == EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
@ -779,7 +779,7 @@ _efl_ui_slider_theme_group_get(Evas_Object *obj, Efl_Ui_Slider_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
_efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
@ -1299,7 +1299,7 @@ _efl_ui_slider_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
}
EOLIAN static Eina_Bool
_efl_ui_slider_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_slider_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;

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

@ -37,10 +37,10 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
class.constructor;
Efl.Object.constructor;
Efl.Canvas.Group.group_calculate;
Elm.Widget.theme_apply;
Elm.Widget.on_access_activate;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Range.range_value { get; set; }
Efl.Ui.Range.range_min_max {get; set; }
Efl.Ui.Direction.direction { get; set; }

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

@ -151,7 +151,7 @@ _efl_ui_spin_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Spin_Data *_pd EINA_UNUSED)
}
EOLIAN static Eina_Bool
_efl_ui_spin_elm_widget_widget_event(Eo *obj, Efl_Ui_Spin_Data *sd, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED)
_efl_ui_spin_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Spin_Data *sd, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED)
{
Eo *ev = eo_event->info;

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

@ -11,7 +11,7 @@ class Efl.Ui.Spin (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
implements {
Efl.Object.constructor;
Efl.Object.destructor;
Elm.Widget.widget_event;
Efl.Ui.Widget.widget_event;
Efl.Ui.Range.range_min_max { get; set; }
Efl.Ui.Range.range_step { get; set; }
Efl.Ui.Range.range_value { get; set; }

6
src/lib/elementary/efl_ui_spin_button.c
View File

@ -536,7 +536,7 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
}
EOLIAN static Eina_Bool
_efl_ui_spin_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED)
_efl_ui_spin_button_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED)
{
Eo *ev = eo_event->info;
@ -568,7 +568,7 @@ _efl_ui_spin_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Spin_Button_Data *sd
}
EOLIAN static Eina_Bool
_efl_ui_spin_button_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Spin_Button_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_spin_button_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Spin_Button_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
@ -714,7 +714,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_spin_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -64,9 +64,9 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition,
}
implements {
Efl.Object.constructor;
Elm.Widget.theme_apply;
Elm.Widget.widget_event;
Elm.Widget.on_focus_update;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Range.range_value { set; }
Efl.Access.name { get; }
Efl.Access.Value.value_and_text { get; set; }

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

@ -29,7 +29,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_table_elm_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED)
_efl_ui_table_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));

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

@ -1,11 +1,11 @@
class Efl.Ui.Table (Elm.Widget, Efl.Pack.Table, Efl.Pack.Layout,
class Efl.Ui.Table (Efl.Ui.Widget, Efl.Pack.Table, Efl.Pack.Layout,
Efl.Ui.Direction)
{
[[Efl UI table class]]
implements {
Efl.Object.constructor;
Efl.Canvas.Group.group_calculate;
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
//Efl.Container.content_remove; // TODO
Efl.Container.content_iterate;
Efl.Container.content_count;

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

@ -792,7 +792,7 @@ _get_drop_format(Evas_Object *obj)
/* we can't reuse layout's here, because it's on entry_edje only */
EOLIAN static Eina_Bool
_efl_ui_text_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool disabled)
_efl_ui_text_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool disabled)
{
const char *emission ;
@ -852,7 +852,7 @@ _efl_ui_text_background_switch(Evas_Object *from_edje, Evas_Object *to_edje)
/* we can't issue the layout's theming code here, cause it assumes an
* unique edje object, always */
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
_efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
{
const char *str;
Efl_Ui_Theme_Apply theme_apply;
@ -861,7 +861,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
// Note: We are skipping elm_layout here! This is by design.
// This assumes the following inheritance: my_class -> layout -> widget ...
theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS));
if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
efl_event_freeze(obj);
@ -1126,7 +1126,7 @@ _return_key_enabled_check(Evas_Object *obj)
}
EOLIAN static Eina_Bool
_efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_text_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Evas_Object *top;
Eina_Bool top_is_win = EINA_FALSE;
@ -1185,7 +1185,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec
}
EOLIAN static Eina_Rect
_efl_ui_text_elm_widget_interest_region_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
_efl_ui_text_efl_ui_widget_interest_region_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
{
Evas_Coord edje_x, edje_y, elm_x, elm_y;
Eina_Rect r = {};
@ -1220,7 +1220,7 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r)
}
EOLIAN static Eina_Bool
_efl_ui_text_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Evas_Object *sobj)
_efl_ui_text_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
Eina_Bool ret = EINA_FALSE;
/* unfortunately entry doesn't follow the signal pattern
@ -3968,7 +3968,7 @@ _efl_ui_text_anchor_hover_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
/* END - ANCHOR HOVER */
EOLIAN static Eina_Bool
_efl_ui_text_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
_efl_ui_text_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
{
if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;

12
src/lib/elementary/efl_ui_text.eo
View File

@ -357,12 +357,12 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Layout.Signal.signal_callback_add;
Efl.Layout.Signal.signal_callback_del;
Efl.Layout.Signal.signal_emit;
Elm.Widget.on_access_activate;
Elm.Widget.theme_apply;
Elm.Widget.on_focus_update;
Elm.Widget.interest_region { get; }
Elm.Widget.on_disabled_update;
Elm.Widget.widget_sub_object_del;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Widget.interest_region { get; }
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;
Elm.Interface_Scrollable.policy { set; }
Elm.Interface_Scrollable.bounce_allow { set; }
Efl.Access.state_set { get; }

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

@ -543,7 +543,7 @@ _efl_ui_textpath_efl_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Data *pd
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_textpath_elm_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd)
_efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd)
{
Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -51,7 +51,7 @@ class Efl.Ui.Textpath (Efl.Ui.Layout, Efl.Object, Efl.Text, Efl.Gfx.Path)
Efl.Canvas.Group.group_calculate;
Efl.Text.text {get; set;}
Efl.Part.part;
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
Efl.Gfx.position { set; }
Efl.Gfx.size { set; }
}

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

@ -64,7 +64,7 @@ class Efl.Ui.Video (Efl.Ui.Layout, Efl.File,
class.constructor;
Efl.Object.constructor;
Efl.File.file { get; set; }
Elm.Widget.widget_event;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
}
}

246
src/lib/elementary/elm_widget.c → src/lib/elementary/efl_ui_widget.c
View File

@ -24,9 +24,9 @@
#define EFL_INTERNAL_UNSTABLE
#include "interfaces/efl_common_internal.h"
#define MY_CLASS ELM_WIDGET_CLASS
#define MY_CLASS EFL_UI_WIDGET_CLASS
#define MY_CLASS_NAME "Elm_Widget"
#define MY_CLASS_NAME "Efl_Ui_Widget"
#define MY_CLASS_NAME_LEGACY "elm_widget"
#define ELM_WIDGET_DATA_GET(o, wd) \
@ -42,7 +42,7 @@
if (!sd) return
#define ELM_WIDGET_FOCUS_GET(obj) \
(efl_isa(obj, ELM_WIDGET_CLASS) && \
(efl_isa(obj, EFL_UI_WIDGET_CLASS) && \
((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \
(efl_ui_focus_object_focus_get(obj))))
@ -114,7 +114,7 @@ static void
_on_sub_obj_del(void *data, const Efl_Event *event);
static void _propagate_event(void *data, const Efl_Event *eo_event);
static void _elm_widget_focus_tree_unfocusable_handle(Eo *obj);
static void _elm_widget_shadow_update(Elm_Widget *obj);
static void _elm_widget_shadow_update(Efl_Ui_Widget *obj);
EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
{ EFL_EVENT_DEL, _on_sub_obj_del });
@ -184,7 +184,7 @@ _elm_widget_focus_highlight_start(const Evas_Object *obj)
}
Evas_Object *
_elm_widget_focus_highlight_object_get(const Evas_Object *obj)
_efl_ui_widget_focus_highlight_object_get(const Evas_Object *obj)
{
Evas_Object *top = elm_widget_top_get(obj);
@ -194,7 +194,7 @@ _elm_widget_focus_highlight_object_get(const Evas_Object *obj)
}
EOLIAN static Eina_Bool
_elm_widget_focus_highlight_enabled_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
_efl_ui_widget_focus_highlight_enabled_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
{
// Forward to closest parent Window
const Evas_Object *win = elm_widget_top_get(obj);
@ -206,7 +206,7 @@ _elm_widget_focus_highlight_enabled_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_
}
EOLIAN static void
_elm_widget_focus_highlight_enabled_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable)
_efl_ui_widget_focus_highlight_enabled_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable)
{
// Forward to closest parent Window
Evas_Object *win = elm_widget_top_get(obj);
@ -216,7 +216,7 @@ _elm_widget_focus_highlight_enabled_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_
}
EOLIAN static Eina_Bool
_elm_widget_focus_highlight_animate_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
_efl_ui_widget_focus_highlight_animate_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
{
// Forward to closest parent Window
const Evas_Object *win = elm_widget_top_get(obj);
@ -228,7 +228,7 @@ _elm_widget_focus_highlight_animate_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_
}
EOLIAN static void
_elm_widget_focus_highlight_animate_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable)
_efl_ui_widget_focus_highlight_animate_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable)
{
// Forward to closest parent Window
Evas_Object *win = elm_widget_top_get(obj);
@ -238,7 +238,7 @@ _elm_widget_focus_highlight_animate_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_
}
EOLIAN static Eina_Bool
_elm_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, const char *style)
_efl_ui_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, const char *style)
{
// Forward to closest parent Window
Evas_Object *win = elm_widget_top_get(obj);
@ -250,7 +250,7 @@ _elm_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
}
EOLIAN static const char *
_elm_widget_focus_highlight_style_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
_efl_ui_widget_focus_highlight_style_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
{
// Forward to closest parent Window
Evas_Object *win = elm_widget_top_get(obj);
@ -264,7 +264,7 @@ _elm_widget_focus_highlight_style_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
static Eina_Bool
_tree_unfocusable(Eo *obj)
{
Elm_Widget *wid = obj;
Efl_Ui_Widget *wid = obj;
do {
ELM_WIDGET_DATA_GET(wid, wid_pd);
@ -278,7 +278,7 @@ _tree_unfocusable(Eo *obj)
static Eina_Bool
_tree_disabled(Eo *obj)
{
Elm_Widget *wid = obj;
Efl_Ui_Widget *wid = obj;
do {
ELM_WIDGET_DATA_GET(wid, wid_pd);
@ -335,7 +335,7 @@ _focus_manager_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
}
EOLIAN static Eina_Bool
_elm_widget_focus_state_apply(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect)
_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect)
{
Eina_Bool registered = EINA_TRUE;
@ -451,7 +451,7 @@ _focus_state_eval(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool should, Eina_Boo
static Efl_Ui_Focus_Object*
_logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool should)
{
Elm_Widget *parent;
Efl_Ui_Widget *parent;
Efl_Ui_Focus_Parent_Provider *provider;
if (should)
@ -471,7 +471,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
//update old logical parent;
if (pd->logical.parent)
{
if (efl_isa(pd->logical.parent, ELM_WIDGET_CLASS))
if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS))
{
ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd);
if (!logical_wd)
@ -487,7 +487,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
}
if (parent)
{
if (efl_isa(parent, ELM_WIDGET_CLASS))
if (efl_isa(parent, EFL_UI_WIDGET_CLASS))
{
ELM_WIDGET_DATA_GET(parent, parent_wd);
if (!parent_wd)
@ -517,14 +517,14 @@ _full_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
old_parent = _logical_parent_eval(obj, pd, should);
if (efl_isa(old_parent, ELM_WIDGET_CLASS))
if (efl_isa(old_parent, EFL_UI_WIDGET_CLASS))
{
//emit signal and focus eval old and new
ELM_WIDGET_DATA_GET(old_parent, old_pd);
_full_eval(old_parent, old_pd);
}
if (efl_isa(pd->logical.parent, ELM_WIDGET_CLASS))
if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS))
{
ELM_WIDGET_DATA_GET(pd->logical.parent, new_pd);
_full_eval(pd->logical.parent, new_pd);
@ -702,7 +702,7 @@ _obj_mouse_in(void *data,
}
EOLIAN static void
_elm_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv)
_efl_ui_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv)
{
priv->obj = obj;
@ -725,7 +725,7 @@ _elm_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv)
}
EOLIAN static void
_elm_widget_efl_canvas_group_group_del(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_efl_canvas_group_group_del(Eo *obj, Elm_Widget_Smart_Data *sd)
{
Evas_Object *sobj;
Elm_Translate_String_Data *ts;
@ -801,7 +801,7 @@ _smart_reconfigure(Elm_Widget_Smart_Data *sd)
}
EOLIAN static void
_elm_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos)
_efl_ui_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
@ -814,7 +814,7 @@ _elm_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd,
}
EOLIAN static void
_elm_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz)
_efl_ui_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
@ -838,15 +838,15 @@ _full_eval_children(Eo *obj, Elm_Widget_Smart_Data *sd)
{
Elm_Widget_Smart_Data *sd_child;
if (!efl_isa(child, ELM_WIDGET_CLASS)) continue;
if (!efl_isa(child, EFL_UI_WIDGET_CLASS)) continue;
sd_child = efl_data_scope_get(child, ELM_WIDGET_CLASS);
sd_child = efl_data_scope_get(child, EFL_UI_WIDGET_CLASS);
_full_eval_children(child, sd_child);
}
}
EOLIAN static void
_elm_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis)
_efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis)
{
Eina_Iterator *it;
Evas_Object *o;
@ -886,7 +886,7 @@ _elm_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vi
}
EOLIAN static void
_elm_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, int g, int b, int a)
_efl_ui_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, int g, int b, int a)
{
Eina_Iterator *it;
Evas_Object *o;
@ -905,7 +905,7 @@ _elm_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, i
}
EOLIAN static void
_elm_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool hide)
_efl_ui_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool hide)
{
Eina_Iterator *it;
Evas_Object *o;
@ -927,7 +927,7 @@ _elm_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd
}
EOLIAN static void
_elm_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool frame)
_efl_ui_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool frame)
{
Evas_Object *o;
Eina_List *li;
@ -942,7 +942,7 @@ _elm_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data
}
EOLIAN static void
_elm_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip)
_efl_ui_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip)
{
Eina_Iterator *it;
Evas_Object *o;
@ -962,13 +962,13 @@ _elm_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_
}
EOLIAN static void
_elm_widget_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
_efl_ui_widget_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
/* a NO-OP, on the base */
}
EOLIAN static void
_elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *pd, Evas_Object *child)
_efl_ui_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *pd, Evas_Object *child)
{
int r, g, b, a;
efl_canvas_group_member_add(efl_super(obj, MY_CLASS), child);
@ -991,7 +991,7 @@ _elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *pd
}
EOLIAN static void
_elm_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
_efl_ui_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
{
if (!evas_object_data_get(child, "_elm_leaveme"))
evas_object_clip_unset(child);
@ -1142,7 +1142,7 @@ elm_widget_focus_region_show(Eo *obj)
}
EOLIAN static void
_elm_widget_widget_parent_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *parent EINA_UNUSED)
_efl_ui_widget_widget_parent_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *parent EINA_UNUSED)
{
}
@ -1179,7 +1179,7 @@ elm_widget_access(Evas_Object *obj,
}
EOLIAN static void
_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool is_access EINA_UNUSED)
_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool is_access EINA_UNUSED)
{
}
@ -1256,7 +1256,7 @@ elm_widget_theme_specific(Evas_Object *obj,
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
_efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
_elm_widget_mirrored_reload(obj);
if (elm_widget_disabled_get(obj))
@ -1275,7 +1275,7 @@ _elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
*
**/
EOLIAN static Eina_Bool
_elm_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return sd->is_mirrored;
}
@ -1289,7 +1289,7 @@ _elm_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data
* @param mirrored EINA_TRUE to set mirrored mode. EINA_FALSE to unset.
*/
EOLIAN static void
_elm_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored)
_efl_ui_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored)
{
mirrored = !!mirrored;
@ -1307,7 +1307,7 @@ _elm_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bo
*
**/
EOLIAN static Eina_Bool
_elm_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return sd->mirrored_auto_mode;
}
@ -1322,7 +1322,7 @@ _elm_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_S
* @param automatic EINA_TRUE for auto mirrored mode. EINA_FALSE for manual.
*/
EOLIAN static void
_elm_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic)
_efl_ui_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic)
{
if (sd->mirrored_auto_mode != automatic)
{
@ -1336,7 +1336,7 @@ _elm_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *s
}
EOLIAN static void
_elm_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb func_free_cb)
_efl_ui_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb func_free_cb)
{
if ((sd->on_show_region_data == data) && (sd->on_show_region == func))
return;
@ -1362,7 +1362,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
Eo *parent = NULL;
parent = efl_parent_get(sobj);
if (!efl_isa(parent, ELM_WIDGET_CLASS))
if (!efl_isa(parent, EFL_UI_WIDGET_CLASS))
{
ERR("You passed a wrong parent parameter (%p %s). "
"Elementary widget's parent should be an elementary widget.", parent, evas_object_type_get(parent));
@ -1386,7 +1386,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
* @see elm_widget_sub_object_parent_add()
*/
EOLIAN static Eina_Bool
_elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj)
_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj)
{
Eina_Bool mirrored, pmirrored = efl_ui_mirrored_get(obj);
@ -1507,7 +1507,7 @@ end:
}
EOLIAN static Eina_Bool
_elm_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj)
_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj)
{
Evas_Object *sobj_parent;
@ -1596,7 +1596,7 @@ _elm_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec
/* protected function - for widget developers only */
EOLIAN static void
_elm_widget_resize_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eo *sobj)
_efl_ui_widget_resize_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eo *sobj)
{
Evas_Object *parent;
@ -1666,7 +1666,7 @@ elm_widget_hover_object_set(Eo *obj, Evas_Object *sobj)
}
EOLIAN static void
_elm_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focus)
_efl_ui_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focus)
{
can_focus = !!can_focus;
@ -1720,7 +1720,7 @@ _elm_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_fo
}
EOLIAN static Eina_Bool
_elm_widget_focus_allow_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_focus_allow_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return sd->can_focus;
}
@ -1907,12 +1907,12 @@ elm_widget_highlight_get(const Eo *obj)
}
EOLIAN static Evas_Object*
_elm_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
_efl_ui_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
{
Elm_Widget *parent = elm_widget_parent_get(obj);
Efl_Ui_Widget *parent = elm_widget_parent_get(obj);
if (parent)
{
if (!efl_isa(parent, ELM_WIDGET_CLASS)) return NULL;
if (!efl_isa(parent, EFL_UI_WIDGET_CLASS)) return NULL;
return efl_ui_widget_top_get(parent);
}
return obj;
@ -2360,7 +2360,7 @@ elm_widget_parent_highlight_set(Eo *obj, Eina_Bool highlighted)
}
EOLIAN static Evas_Object*
_elm_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return sd->parent_obj;
}
@ -2427,7 +2427,7 @@ elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled)
}
EOLIAN static void
_elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
_efl_ui_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
{
if (sd->disabled == disabled) return;
sd->disabled = !!disabled;
@ -2439,14 +2439,14 @@ _elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
}
EOLIAN static Eina_Bool
_elm_widget_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
if (sd->disabled) return EINA_TRUE;
return elm_widget_disabled_get(elm_widget_parent_get(obj));
}
EOLIAN static void
_elm_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Eina_Bool forceshow)
_efl_ui_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Eina_Bool forceshow)
{
Evas_Object *parent_obj, *child_obj;
Evas_Coord px, py, cx, cy, nx = 0, ny = 0;
@ -2490,7 +2490,7 @@ _elm_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Ei
}
EOLIAN static Eina_Rect
_elm_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return (Eina_Rect) sd->show_region;
}
@ -2514,7 +2514,7 @@ _elm_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
* @ingroup Widget
*/
EOLIAN static Eina_Rect
_elm_widget_interest_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
_efl_ui_widget_interest_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
Eina_Rect r = {};
r.size = efl_gfx_size_get(obj);
@ -2522,7 +2522,7 @@ _elm_widget_interest_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
}
EOLIAN static void
_elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
{
sd->scroll_hold++;
if (sd->scroll_hold == 1)
@ -2546,7 +2546,7 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
}
EOLIAN static void
_elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
{
sd->scroll_hold--;
if (!sd->scroll_hold)
@ -2579,7 +2579,7 @@ elm_widget_scroll_hold_get(const Eo *obj)
}
EOLIAN static void
_elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
{
sd->scroll_freeze++;
if (sd->scroll_freeze == 1)
@ -2603,7 +2603,7 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
}
EOLIAN static void
_elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
{
sd->scroll_freeze--;
if (!sd->scroll_freeze)
@ -2636,7 +2636,7 @@ elm_widget_scroll_freeze_get(const Eo *obj)
}
EOLIAN static void
_elm_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
_efl_ui_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
{
if (scale < 0.0) scale = 0.0;
if (sd->scale != scale)
@ -2647,7 +2647,7 @@ _elm_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
}
EOLIAN static double
_elm_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
// FIXME: save walking up the tree by storing/caching parent scale
if (sd->scale == 0.0)
@ -2841,7 +2841,7 @@ elm_widget_part_translatable_text_get(const Eo *obj, const char *part, const cha
}
EOLIAN static void
_elm_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
const Eina_List *l;
Evas_Object *child;
@ -2869,13 +2869,13 @@ _elm_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widg
}
EOLIAN static void
_elm_widget_access_info_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *txt)
_efl_ui_widget_access_info_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *txt)
{
eina_stringshare_replace(&sd->access_info, txt);
}
EOLIAN static const char*
_elm_widget_access_info_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_access_info_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return sd->access_info;
}
@ -2895,7 +2895,7 @@ elm_widget_theme_get(const Evas_Object *obj)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
_efl_ui_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
{
if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj))
{
@ -2910,7 +2910,7 @@ _elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
}
EOLIAN static const char*
_elm_widget_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
const char *ret;
ret = "default";
@ -3050,7 +3050,7 @@ _convert(Efl_Dbg_Info *info, Eina_Iterator *ptr_list)
}
EOLIAN static void
_elm_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
_efl_ui_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
{
efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
Efl_Ui_Focus_Relations *rel = NULL;
@ -3339,7 +3339,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
}
EOLIAN static Eina_Rect
_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd)
{
Evas_Coord ox = 0, oy = 0, ow = 0, oh = 0;
Evas_Object *scroller = (Evas_Object *)obj;
@ -3375,19 +3375,19 @@ _elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd)
}
EOLIAN static Elm_Object_Item*
_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
return NULL;
}
EOLIAN static void
_elm_widget_interest_region_mode_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd, Elm_Focus_Region_Show_Mode mode)
_efl_ui_widget_interest_region_mode_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd, Elm_Focus_Region_Show_Mode mode)
{
_pd->focus_region_show_mode = mode;
}
EOLIAN static Elm_Focus_Region_Show_Mode
_elm_widget_interest_region_mode_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd)
_efl_ui_widget_interest_region_mode_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd)
{
return _pd->focus_region_show_mode;
}
@ -3451,7 +3451,7 @@ elm_widget_display_mode_set(Evas_Object *obj, Evas_Display_Mode dispmode)
}
EOLIAN static void
_elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
_efl_ui_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
{
int orient_mode = -1;
@ -3467,14 +3467,14 @@ _elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Ei
}
EOLIAN static Eina_Bool
_elm_widget_orientation_mode_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_orientation_mode_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
if (sd->orient_mode == -1) return EINA_TRUE;
else return EINA_FALSE;
}
EOLIAN static void
_elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode)
_efl_ui_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode)
{
Evas_Object *child;
Eina_List *l;
@ -3505,7 +3505,7 @@ _elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient
*
**/
EOLIAN static Elm_Focus_Move_Policy
_elm_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return sd->focus_move_policy;
}
@ -3520,7 +3520,7 @@ _elm_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd
*/
EOLIAN static void
_elm_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Move_Policy policy)
_efl_ui_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Move_Policy policy)
{
if (sd->focus_move_policy == policy) return;
sd->focus_move_policy = policy;
@ -3534,7 +3534,7 @@ _elm_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd
*
**/
EOLIAN static Eina_Bool
_elm_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return sd->focus_move_policy_auto_mode;
}
@ -3549,7 +3549,7 @@ _elm_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smar
* @param automatic EINA_TRUE for auto focus_move_policy mode. EINA_FALSE for manual.
*/
EOLIAN static void
_elm_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic)
_efl_ui_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic)
{
if (sd->focus_move_policy_auto_mode != automatic)
{
@ -3679,7 +3679,7 @@ elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *
group = eina_stringshare_add(name);
else
group = eina_stringshare_printf("%s/%s", elm_widget_theme_element_get(obj), name);
if (efl_isa(component, ELM_WIDGET_CLASS))
if (efl_isa(component, EFL_UI_WIDGET_CLASS))
{
changed |= elm_widget_theme_klass_set(component, elm_widget_theme_klass_get(obj));
changed |= elm_widget_theme_element_set(component, (const char *)group);
@ -5152,7 +5152,7 @@ _focus_event_changed(void *data EINA_UNUSED, const Efl_Event *event)
}
EOLIAN static Eo *
_elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
_efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
{
Eo *parent = NULL;
@ -5178,7 +5178,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE
}
EOLIAN static Efl_Object*
_elm_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd)
_efl_ui_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd)
{
Eo *eo;
@ -5191,7 +5191,7 @@ _elm_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd)
EOLIAN static void
_elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
{
if (sd->manager.provider)
{
@ -5207,13 +5207,13 @@ _elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
}
sd->on_destroy = EINA_TRUE;
efl_destructor(efl_super(obj, ELM_WIDGET_CLASS));
efl_destructor(efl_super(obj, EFL_UI_WIDGET_CLASS));
sd->on_destroy = EINA_FALSE;
}
/* internal eo */
static void
_elm_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd)
{
efl_canvas_object_legacy_ctor(efl_super(obj, MY_CLASS));
sd->legacy = EINA_TRUE;
@ -5221,7 +5221,7 @@ _elm_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd)
}
EOLIAN static void
_elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Strbuf *sb)
_efl_ui_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Strbuf *sb)
{
const char *focus = "";
@ -5231,7 +5231,7 @@ _elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EI
}
EOLIAN static Eina_Bool
_elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool focused;
@ -5250,19 +5250,19 @@ _elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item
}
EOLIAN static Eina_Bool
_elm_widget_on_disabled_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool disabled EINA_UNUSED)
_efl_ui_widget_on_disabled_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool disabled EINA_UNUSED)
{
return EINA_FALSE;
}
EOLIAN static Eina_Bool
_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *source EINA_UNUSED)
_efl_ui_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *source EINA_UNUSED)
{
return EINA_FALSE;
}
EOLIAN static Eina_Bool
_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Ui_Activate act EINA_UNUSED)
_efl_ui_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Ui_Activate act EINA_UNUSED)
{
WRN("The %s widget does not implement the \"activate\" functions.",
efl_class_name_get(efl_class_get(obj)));
@ -5270,13 +5270,13 @@ _elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd E
}
EOLIAN static void
_elm_widget_class_constructor(Efl_Class *klass)
_efl_ui_widget_class_constructor(Efl_Class *klass)
{
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
EOLIAN static Eina_Bool
_elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_efl_ui_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
if (elm_object_focus_allow_get(obj))
{
@ -5290,10 +5290,10 @@ _elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd E
}
EOLIAN static const char*
_elm_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
_efl_ui_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
const char *ret, *name;
name = efl_access_name_get(efl_super(obj, ELM_WIDGET_CLASS));
name = efl_access_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
if (name) return name;
@ -5304,7 +5304,7 @@ _elm_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
}
EOLIAN static Eina_List*
_elm_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
_efl_ui_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
{
Eina_List *l, *accs = NULL;
Evas_Object *widget;
@ -5329,7 +5329,7 @@ _elm_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *
}
EOLIAN static Eo*
_elm_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_efl_ui_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
Efl_Access_Type type;
Efl_Access *parent = obj;
@ -5344,11 +5344,11 @@ _elm_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED
}
EOLIAN static Efl_Access_State_Set
_elm_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_efl_ui_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
Efl_Access_State_Set states = 0;
states = efl_access_state_set_get(efl_super(obj, ELM_WIDGET_CLASS));
states = efl_access_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
if (evas_object_visible_get(obj))
{
@ -5373,11 +5373,11 @@ _elm_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNU
}
EOLIAN static Eina_List*
_elm_widget_efl_access_attributes_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_efl_ui_widget_efl_access_attributes_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
Eina_List *attr_list = NULL;
attr_list = efl_access_attributes_get(efl_super(obj, ELM_WIDGET_CLASS));
attr_list = efl_access_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
//Add type and style information in addition.
Efl_Access_Attribute *attr = NULL;
@ -5470,7 +5470,7 @@ _elm_widget_item_efl_access_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_
}
EOLIAN static Efl_Object *
_elm_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass)
_efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass)
{
Efl_Object *lookup = NULL;
@ -5489,25 +5489,25 @@ _elm_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, c
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_widget_efl_ui_focus_user_focus_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_efl_ui_widget_efl_ui_focus_user_focus_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
return pd->focus.parent;
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_widget_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_efl_ui_widget_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
return pd->focus.manager;
}
EOLIAN static Eina_Rect
_elm_widget_efl_ui_focus_object_focus_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_efl_ui_widget_efl_ui_focus_object_focus_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
return efl_gfx_geometry_get(obj);
}
EOLIAN static void
_elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus)
_efl_ui_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus)
{
pd->focused = focus;
@ -5517,7 +5517,7 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root EINA_UNUSED)
_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root EINA_UNUSED)
{
ERR("No manager presented");
return NULL;
@ -5541,7 +5541,7 @@ elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *con
if (!efl_isa(obj, EFL_PART_INTERFACE)) return;
if (!part)
{
part = elm_widget_default_content_part_get(obj);
part = efl_ui_widget_default_content_part_get(obj);
if (!part) return;
}
efl_content_set(efl_part(obj, part), content);
@ -5556,7 +5556,7 @@ elm_widget_content_part_get(const Evas_Object *obj, const char *part)
if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
if (!part)
{
part = elm_widget_default_content_part_get(obj);
part = efl_ui_widget_default_content_part_get(obj);
if (!part) return NULL;
}
return efl_content_get(efl_part(obj, part));
@ -5571,7 +5571,7 @@ elm_widget_content_part_unset(Evas_Object *obj, const char *part)
if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
if (!part)
{
part = elm_widget_default_content_part_get(obj);
part = efl_ui_widget_default_content_part_get(obj);
if (!part) return NULL;
}
return efl_content_unset(efl_part(obj, part));
@ -5739,7 +5739,7 @@ _widget_shadow_update(Widget_Shadow *ws)
}
static void
_elm_widget_shadow_update(Elm_Widget *obj)
_elm_widget_shadow_update(Efl_Ui_Widget *obj)
{
Widget_Shadow *shadow = _widget_shadow_part_get(obj);
_widget_shadow_update(shadow);
@ -5890,7 +5890,7 @@ _efl_ui_widget_part_shadow_efl_gfx_filter_filter_state_get(Eo *obj, void *_pd EI
/* Efl.Part implementation */
EOLIAN static Efl_Object *
_elm_widget_efl_part_part(const Eo *obj, Elm_Widget_Smart_Data *wd EINA_UNUSED, const char *part)
_efl_ui_widget_efl_part_part(const Eo *obj, Elm_Widget_Smart_Data *wd EINA_UNUSED, const char *part)
{
if (eina_streq(part, "background"))
return ELM_PART_IMPLEMENT(EFL_UI_WIDGET_PART_BG_CLASS, obj, part);
@ -5914,7 +5914,7 @@ _efl_ui_widget_part_efl_object_destructor(Eo *obj, Elm_Part_Data *pd)
/* Efl.Part Bg implementation */
Efl_Canvas_Object *
_efl_ui_widget_bg_get(Elm_Widget *obj)
_efl_ui_widget_bg_get(Efl_Ui_Widget *obj)
{
Elm_Widget_Smart_Data *sd = efl_data_scope_get(obj, MY_CLASS);
Evas_Object *bg_obj = sd->bg;
@ -5994,21 +5994,21 @@ _efl_ui_widget_part_bg_efl_image_scale_type_get(Eo *obj, void *pd EINA_UNUSED)
/* Internal EO APIs and hidden overrides */
EFL_FUNC_BODY_CONST(elm_widget_default_content_part_get, const char *, NULL)
EFL_FUNC_BODY_CONST(elm_widget_default_text_part_get, const char *, NULL)
EFL_FUNC_BODY_CONST(efl_ui_widget_default_content_part_get, const char *, NULL)
EFL_FUNC_BODY_CONST(efl_ui_widget_default_text_part_get, const char *, NULL)
ELM_PART_CONTENT_DEFAULT_GET(elm_widget, NULL)
ELM_PART_TEXT_DEFAULT_GET(elm_widget, NULL)
ELM_PART_CONTENT_DEFAULT_GET(efl_ui_widget, NULL)
ELM_PART_TEXT_DEFAULT_GET(efl_ui_widget, NULL)
#define ELM_WIDGET_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_widget), \
ELM_PART_CONTENT_DEFAULT_OPS(elm_widget), \
ELM_PART_TEXT_DEFAULT_OPS(elm_widget), \
EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _elm_widget_legacy_ctor), \
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_widget_efl_object_dbg_info_get)
#define EFL_UI_WIDGET_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_widget), \
ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_widget), \
ELM_PART_TEXT_DEFAULT_OPS(efl_ui_widget), \
EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_ui_widget_legacy_ctor), \
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_widget_efl_object_dbg_info_get)
#include "elm_widget_item.eo.c"
#include "elm_widget.eo.c"
#include "efl_ui_widget.eo.c"
/* Others */
#include "efl_ui_translatable.eo.c"

18
src/lib/elementary/elm_widget.eo → src/lib/elementary/efl_ui_widget.eo
View File

@ -14,14 +14,14 @@ struct Efl.Ui.Widget.Focus_State {
}
/* ATTENTION: Rename to Efl.Ui.Widget is imminent. */
abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part,
Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor,
Efl.Ui.Translatable)
abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part,
Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor,
Efl.Ui.Translatable)
{
[[Elementary widget abstract class]]
legacy_prefix: elm_widget;
eo_prefix: efl_ui_widget;
//eo_prefix: efl_ui_widget;
event_prefix: efl_ui_widget;
data: Efl_Ui_Widget_Data;
methods {
@ -158,7 +158,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
@property widget_parent @protected {
[[The internal parent of this widget.
@Elm.Widget objects have a parent hierarchy that may differ slightly
@Efl.Ui.Widget objects have a parent hierarchy that may differ slightly
from their @Efl.Object or @Efl.Canvas.Object hierarchy. This is
meant for internal handling.
@ -169,7 +169,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
legacy: elm_widget_parent_get; /* internal in legacy */
}
values {
parent: Elm.Widget @nullable; [[Widget parent object]]
parent: Efl.Ui.Widget @nullable; [[Widget parent object]]
}
}
@property widget_top {
@ -194,7 +194,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
legacy: elm_widget_top_get; /* internal in legacy */
}
values {
top: Elm.Widget; [[Top widget, usually a window.]]
top: Efl.Ui.Widget; [[Top widget, usually a window.]]
}
}
@ -553,7 +553,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
[[The focus manager to register with.]]
@inout configured_state : Efl.Ui.Widget.Focus_State;
[[The evalulated Focus state that should be used.]]
@in redirect : Elm.Widget;
@in redirect : Efl.Ui.Widget;
[[A redirect that will be set by the elm.widget implementation.]]
}
return: bool; [[Returns whether the widget is registered or not.]]

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

@ -1666,7 +1666,7 @@ _elm_win_state_change(Ecore_Evas *ee)
}
EOLIAN static Eina_Bool
_efl_ui_win_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_win_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL))
return EINA_TRUE;
@ -5472,7 +5472,7 @@ _efl_ui_win_efl_canvas_object_legacy_ctor(Eo *obj, Efl_Ui_Win_Data *sd)
}
EOLIAN static Efl_Ui_Focus_Manager*
_efl_ui_win_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
_efl_ui_win_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
{
Efl_Ui_Focus_Manager *manager;
@ -6595,7 +6595,7 @@ _efl_ui_win_keygrab_unset(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *
}
EOLIAN static void
_efl_ui_win_elm_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool enabled)
_efl_ui_win_efl_ui_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool enabled)
{
// Do not call efl_super() here. Only Win handles this property.
enabled = !!enabled;
@ -6611,7 +6611,7 @@ _efl_ui_win_elm_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_W
}
EOLIAN static Eina_Bool
_efl_ui_win_elm_widget_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
_efl_ui_win_efl_ui_widget_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
// Do not call efl_super() here. Only Win handles this property.
return sd->focus_highlight.enabled;
@ -6647,7 +6647,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
_efl_ui_win_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
@ -6663,7 +6663,7 @@ _efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
}
EOLIAN static Eina_Bool
_efl_ui_win_elm_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *style)
_efl_ui_win_efl_ui_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *style)
{
// Do not call efl_super() here. Only Win handles this property.
if (!eina_stringshare_replace(&sd->focus_highlight.style, style))
@ -6675,14 +6675,14 @@ _efl_ui_win_elm_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win
}
EOLIAN static const char*
_efl_ui_win_elm_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
_efl_ui_win_efl_ui_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
// Do not call efl_super() here. Only Win handles this property.
return sd->focus_highlight.style;
}
EOLIAN static void
_efl_ui_win_elm_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool animate)
_efl_ui_win_efl_ui_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool animate)
{
// Do not call efl_super() here. Only Win handles this property.
animate = !!animate;
@ -6695,7 +6695,7 @@ _efl_ui_win_elm_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_W
}
EOLIAN static Eina_Bool
_efl_ui_win_elm_widget_focus_highlight_animate_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
_efl_ui_win_efl_ui_widget_focus_highlight_animate_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
// Do not call efl_super() here. Only Win handles this property.
return sd->focus_highlight.animate;
@ -7124,7 +7124,7 @@ _elm_win_bg_must_swallow(Efl_Ui_Win_Data *sd)
sd->legacy.bg_must_swallow_init = 1;
bg = elm_bg_add(sd->obj);
wd = efl_data_scope_get(bg, ELM_WIDGET_CLASS);
wd = efl_data_scope_get(bg, EFL_UI_WIDGET_CLASS);
if (wd)
{
version = edje_object_data_get(wd->resize_obj, "version");

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

@ -157,11 +157,11 @@ enum Efl.Ui.Win.Move_Resize_Mode
right = (1 << 4) [[Start resizing window to the right]]
}
class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window,
Efl.Access.Component, Efl.Access.Widget.Action,
Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part,
Efl.Ui.Focus.Manager )
class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window,
Efl.Access.Component, Efl.Access.Widget.Action,
Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part,
Efl.Ui.Focus.Manager )
{
[[Efl UI window class]]
legacy_prefix: elm_win;
@ -784,14 +784,14 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window,
Efl.Gfx.Stack.raise; [[Places the window at the top of the stack, so
that it's not covered by any other window.]]
Efl.Gfx.Stack.lower; [[This action is ignored by the Window.]]
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Focus.Object.focus { get; }
Elm.Widget.focus_highlight_style { get; set; }
Elm.Widget.focus_highlight_enabled { get; set; }
Elm.Widget.focus_highlight_animate { get; set; }
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Elm.Widget.focus_manager_create;
Efl.Ui.Widget.focus_highlight_style { get; set; }
Efl.Ui.Widget.focus_highlight_enabled { get; set; }
Efl.Ui.Widget.focus_highlight_animate { get; set; }
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.focus_manager_create;
Efl.Access.parent { get; }
Efl.Access.state_set { get; }
Efl.Access.name { get; }

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

@ -61,7 +61,7 @@ _elm_combobox_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Co
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
_elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
{
const char *style;
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -4,7 +4,8 @@
#define EFL_ACCESS_PROTECTED
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_PROTECTED
#define EFL_UI_WIDGET_PROTECTED
//#define EFL_UI_WIDGET_BETA
#define ELM_WIDGET_ITEM_PROTECTED
#define EFL_UI_TRANSLATABLE_PROTECTED
@ -522,12 +523,12 @@ _base_shift_by_arrow(Evas_Object *arrow,
}
EOLIAN static Eina_Bool
_elm_ctxpopup_elm_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *sobj)
_elm_ctxpopup_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
/* Skipping elm_layout widget_sub_object_add in order to ignore size hint changes.
* Note: It is not clear WHY we are doing this. Same reason as genlist?
*/
return elm_widget_sub_object_add(efl_cast(obj, ELM_WIDGET_CLASS), sobj);
return elm_widget_sub_object_add(efl_cast(obj, EFL_UI_WIDGET_CLASS), sobj);
}
EOLIAN static void
@ -667,7 +668,7 @@ _on_content_resized(void *data,
//FIXME: lost the content size when theme hook is called.
EOLIAN static Efl_Ui_Theme_Apply
_elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
_elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -1031,7 +1032,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
}
EOLIAN static Eina_Bool
_elm_ctxpopup_elm_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled)
_elm_ctxpopup_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled)
{
if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;
@ -1118,7 +1119,7 @@ _elm_ctxpopup_efl_canvas_group_group_del(Eo *obj, Elm_Ctxpopup_Data *sd)
}
EOLIAN static void
_elm_ctxpopup_elm_widget_widget_parent_set(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *parent)
_elm_ctxpopup_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *parent)
{
//default parent is to be hover parent
elm_ctxpopup_hover_parent_set(obj, parent);
@ -1445,7 +1446,7 @@ _elm_ctxpopup_efl_ui_menu_selected_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Da
}
EOLIAN static Elm_Object_Item*
_elm_ctxpopup_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd)
_elm_ctxpopup_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd)
{
if (!sd->list) return NULL;

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

@ -232,7 +232,7 @@ _model_str_property_set(Efl_Model *model, const char *property_name, const char
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
_elm_fileselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
{
const char *style;
const char *data;
@ -3067,7 +3067,7 @@ _elm_fileselector_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED
}
EOLIAN static Eina_Bool
_elm_fileselector_elm_widget_focus_state_apply(Eo *obj, Elm_Fileselector_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect)
_elm_fileselector_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Fileselector_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect)
{
Eina_Bool ret = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);

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

@ -44,7 +44,7 @@ _model_free_eo_cb(void *eo)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED)
_elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -160,7 +160,7 @@ _elm_fileselector_entry_elm_layout_sizing_eval(Eo *obj, Elm_Fileselector_Entry_D
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd)
_elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd)
{
const char *style;
char buf[1024];
@ -191,7 +191,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
}
EOLIAN static Eina_Bool
_elm_fileselector_entry_elm_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled)
_elm_fileselector_entry_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled)
{
if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;

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

@ -62,7 +62,7 @@ _elm_hoversel_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Ho
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
Eina_List *l;
@ -669,7 +669,7 @@ _elm_hoversel_efl_gfx_visible_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool vis)
}
EOLIAN static void
_elm_hoversel_elm_widget_widget_parent_set(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, Evas_Object *parent)
_elm_hoversel_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, Evas_Object *parent)
{
elm_hoversel_hover_parent_set(obj, parent);
}
@ -1000,12 +1000,12 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(hoversel, Elm_Hoversel_Data)
EOLIAN static Eina_Bool
_elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
_elm_hoversel_efl_ui_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
{
if (efl_ui_widget_event(efl_super(obj, MY_CLASS), eo_event, src))
return EINA_TRUE; // note: this was FALSE but likely wrong
return _hoversel_elm_widget_widget_event(obj, sd, eo_event, src);
return _hoversel_efl_ui_widget_widget_event(obj, sd, eo_event, src);
}
static void

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

@ -60,7 +60,7 @@ static const Elm_Action key_actions[] = {
};
EOLIAN static void
_elm_naviframe_elm_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA_UNUSED,
_elm_naviframe_efl_ui_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA_UNUSED,
Efl_Canvas_Object *sobj)
{
if (!sobj || !efl_finalized_get(obj)) goto super;
@ -392,7 +392,7 @@ _item_title_enabled_update(Elm_Naviframe_Item_Data *nit, Eina_Bool transition)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
_elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
{
Elm_Naviframe_Item_Data *it;
const char *style = NULL, *sstyle = NULL;
@ -1507,7 +1507,7 @@ _key_action_item_pop(Evas_Object *obj, const char *params EINA_UNUSED)
}
EOLIAN static void
_elm_naviframe_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool is_access)
_elm_naviframe_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool is_access)
{
Elm_Naviframe_Item_Data *it;

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

@ -185,7 +185,7 @@ _update_theme_slider(Evas_Object *obj, Evas_Object *sl, const char *name, const
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
_elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));

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

@ -351,7 +351,7 @@ _populate_theme_scroll(Elm_Popup_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
{
Elm_Popup_Item_Data *it;
Eina_List *elist;
@ -506,7 +506,7 @@ _elm_popup_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd
}
EOLIAN static Eina_Bool
_elm_popup_elm_widget_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *sobj)
_elm_popup_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *sobj)
{
Elm_Popup_Item_Data *it;
Eina_Bool int_ret = EINA_FALSE;
@ -1484,7 +1484,7 @@ _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_i
}
EOLIAN static void
_elm_popup_elm_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object *parent)
_elm_popup_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object *parent)
{
Evas_Coord x, y, w, h;
evas_object_geometry_get(parent, &x, &y, &w, &h);
@ -1503,7 +1503,7 @@ _elm_popup_elm_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object
}
EOLIAN static void
_elm_popup_elm_widget_on_access_update(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Eina_Bool is_access)
_elm_popup_efl_ui_widget_on_access_update(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Eina_Bool is_access)
{
_access_obj_process(obj, is_access);
}

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

@ -10,8 +10,8 @@
#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme"
#if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC)
#define ELM_WIDGET_PROTECTED
#define ELM_WIDGET_BETA
#define EFL_UI_WIDGET_PROTECTED
#define EFL_UI_WIDGET_BETA
#define EFL_CANVAS_OBJECT_PROTECTED
#define EFL_CANVAS_GROUP_PROTECTED
#define EFL_CANVAS_GROUP_BETA

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

@ -84,7 +84,7 @@ _access_action_callback_call(Evas_Object *obj,
}
EOLIAN static Eina_Bool
_elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Activate act)
_elm_access_efl_ui_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Activate act)
{
int type = ELM_ACCESS_ACTION_FIRST;
@ -145,7 +145,7 @@ _elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui
}
EOLIAN static Eina_Bool
_elm_access_elm_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_elm_access_efl_ui_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj));

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

@ -1,4 +1,4 @@
class Elm.Access (Elm.Widget, Efl.Access.Widget.Action)
class Elm.Access (Efl.Ui.Widget, Efl.Access.Widget.Action)
{
[[Elm abstract accessibility class]]
legacy_prefix: elm_access;
@ -7,8 +7,8 @@ class Elm.Access (Elm.Widget, Efl.Access.Widget.Action)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.on_access_activate;
Elm.Widget.on_focus_update;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.on_focus_update;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.state_set { get; }
}

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

@ -113,7 +113,7 @@ _mirroredness_change_eval(Evas_Object *obj)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED)
_elm_actionslider_efl_ui_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED)
{
Eina_Bool mirrored;
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -71,7 +71,7 @@ class Elm.Actionslider (Efl.Ui.Layout, Efl.Ui.Selectable)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
Efl.Part.part;
}
events {

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

@ -27,14 +27,14 @@ static void
_elm_box_efl_ui_focus_composition_prepare(Eo *obj, Elm_Box_Data *pd EINA_UNUSED)
{
Eina_List *n, *nn;
Elm_Widget *elem;
Efl_Ui_Widget *elem;
Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, ELM_WIDGET_CLASS);
Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, EFL_UI_WIDGET_CLASS);
Eina_List *order = evas_object_box_children_get(wpd->resize_obj);
EINA_LIST_FOREACH_SAFE(order, n, nn, elem)
{
if (!efl_isa(elem, ELM_WIDGET_CLASS))
if (!efl_isa(elem, EFL_UI_WIDGET_CLASS))
order = eina_list_remove(order, elem);
}
@ -58,7 +58,7 @@ _child_removed_cb_proxy(void *data, const Efl_Event *event)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
_elm_box_efl_ui_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -97,7 +97,7 @@ _on_size_hints_changed(void *data,
}
EOLIAN static Eina_Bool
_elm_box_elm_widget_widget_sub_object_del(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED, Evas_Object *child)
_elm_box_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED, Evas_Object *child)
{
Eina_Bool int_ret = EINA_FALSE;

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

@ -1,6 +1,6 @@
import evas_box;
class Elm.Box (Elm.Widget, Efl.Ui.Focus.Composition)
class Elm.Box (Efl.Ui.Widget, Efl.Ui.Focus.Composition)
{
[[Elementary box class]]
legacy_prefix: elm_box;
@ -249,8 +249,8 @@ class Elm.Box (Elm.Widget, Efl.Ui.Focus.Composition)
class.constructor;
Efl.Object.constructor;
Efl.Canvas.Group.group_calculate;
Elm.Widget.theme_apply;
Elm.Widget.widget_sub_object_del;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Focus.Composition.prepare;
}
events {

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

@ -173,7 +173,7 @@ _elm_bubble_efl_canvas_group_group_add(Eo *obj, Elm_Bubble_Data *priv)
}
EOLIAN static void
_elm_bubble_elm_widget_on_access_update(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, Eina_Bool is_access)
_elm_bubble_efl_ui_widget_on_access_update(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, Eina_Bool is_access)
{
ELM_BUBBLE_CHECK(obj);

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

@ -38,7 +38,7 @@ class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.on_access_update;
Efl.Ui.Widget.on_access_update;
Efl.Part.part;
}
}

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

@ -859,7 +859,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
_elm_calendar_efl_ui_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -1386,7 +1386,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
}
EOLIAN static Eina_Bool
_elm_calendar_elm_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_calendar_efl_ui_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
@ -1593,7 +1593,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
_elm_calendar_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs)
_elm_calendar_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs)
{
_elm_calendar_smart_focus_next_enable = acs;
_access_obj_process(obj, _elm_calendar_smart_focus_next_enable);

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

@ -412,10 +412,10 @@ class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.A
class.constructor;
Efl.Object.constructor;
Efl.Canvas.Group.group_calculate;
Elm.Widget.theme_apply;
Elm.Widget.on_access_update;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
}
events {

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

@ -605,7 +605,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
_elm_clock_efl_ui_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -765,7 +765,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
_elm_clock_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Clock_Data *_pd EINA_UNUSED, Eina_Bool acs)
_elm_clock_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Clock_Data *_pd EINA_UNUSED, Eina_Bool acs)
{
_elm_clock_smart_focus_next_enable = acs;
_access_obj_process(obj, _elm_clock_smart_focus_next_enable);

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

@ -163,8 +163,8 @@ class Elm.Clock (Efl.Ui.Layout, Efl.Ui.Focus.Composition)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.on_access_update;
Elm.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.theme_apply;
}
events {
changed; [[The clock's user changed the time]]

8
src/lib/elementary/elm_code_widget.c
View File

@ -1811,7 +1811,7 @@ _elm_code_widget_scroll_event_cb(void *data, Evas_Object *obj EINA_UNUSED,
}
EOLIAN static Eina_Bool
_elm_code_widget_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED)
_elm_code_widget_efl_ui_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED)
{
Eo *ev = eo_event->info;
@ -2242,7 +2242,7 @@ _elm_code_widget_cursor_position_get(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_code_widget_elm_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd)
_elm_code_widget_efl_ui_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd)
{
Eo *edje;
int r, g, b, a;
@ -2275,7 +2275,7 @@ _elm_code_widget_alpha_set(Eo *obj, Elm_Code_Widget_Data *pd, int alpha)
{
pd->alpha = alpha;
_elm_code_widget_elm_widget_theme_apply(obj, pd);
_elm_code_widget_efl_ui_widget_theme_apply(obj, pd);
}
EOLIAN static void
@ -2288,7 +2288,7 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
if (!elm_widget_theme_klass_get(obj))
elm_widget_theme_klass_set(obj, "code");
elm_widget_theme_element_set(obj, "layout");
_elm_code_widget_elm_widget_theme_apply(obj, pd);
_elm_code_widget_efl_ui_widget_theme_apply(obj, pd);
efl_canvas_group_add(efl_super(obj, ELM_CODE_WIDGET_CLASS));
elm_object_focus_allow_set(obj, EINA_TRUE);

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

@ -311,8 +311,8 @@ class Elm.Code_Widget (Efl.Ui.Layout, Efl.Access.Text)
class.constructor;
Efl.Object.constructor;
Efl.Object.finalize;
Elm.Widget.widget_event;
Elm.Widget.theme_apply;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
}
constructors {
.code;

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

@ -1318,7 +1318,7 @@ _color_bars_add(Evas_Object *obj)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
_elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
{
int i;
Eina_List *elist;
@ -2243,7 +2243,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static Eina_Rect
_elm_colorselector_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd)
_elm_colorselector_efl_ui_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd)
{
if (sd->focused_item && (sd->focused == ELM_COLORSELECTOR_PALETTE))
{
@ -2257,7 +2257,7 @@ _elm_colorselector_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED,
}
EOLIAN static void
_elm_colorselector_elm_widget_on_access_update(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED, Eina_Bool acs)
_elm_colorselector_efl_ui_widget_on_access_update(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED, Eina_Bool acs)
{
_elm_colorselector_smart_focus_next_enable = acs;
_access_obj_process(obj, _elm_colorselector_smart_focus_next_enable);

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

@ -108,10 +108,10 @@ class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition,
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Elm.Widget.focus_highlight_geometry { get; }
Elm.Widget.on_access_update;
Elm.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.focus_highlight_geometry { get; }
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.children { get; }
}

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

@ -39,9 +39,9 @@ class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable,
Efl.Object.constructor;
Efl.Gfx.visible { set; }
Efl.Gfx.size { set; }
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Translatable.translation_update;
Elm.Widget.widget_event;
Efl.Ui.Widget.widget_event;
Efl.Ui.Autorepeat.autorepeat_supported { get; }
Elm.Genlist.filter { set; }
Efl.Access.Widget.Action.elm_actions { get; }

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

@ -574,7 +574,7 @@ _on_rotation_changed(void *data, const Efl_Event *event EINA_UNUSED)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
_elm_conformant_efl_ui_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -966,7 +966,7 @@ _elm_conformant_efl_canvas_group_group_del(Eo *obj, Elm_Conformant_Data *sd)
}
EOLIAN static void
_elm_conformant_elm_widget_widget_parent_set(Eo *obj, Elm_Conformant_Data *sd, Evas_Object *parent)
_elm_conformant_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Conformant_Data *sd, Evas_Object *parent)
{
#ifdef HAVE_ELEMENTARY_X
Evas_Object *top = elm_widget_top_get(parent);

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

@ -7,8 +7,8 @@ class Elm.Conformant (Efl.Ui.Layout)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.widget_parent { set; }
Elm.Widget.theme_apply;
Efl.Ui.Widget.widget_parent { set; }
Efl.Ui.Widget.theme_apply;
}
events {
virtualkeypad,state,on; [[Called when virtualkeypad was enabled]]

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

@ -201,13 +201,13 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action,
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.widget_parent { set; }
Elm.Widget.on_disabled_update;
Elm.Widget.widget_sub_object_add;
Efl.Ui.Widget.widget_parent { set; }
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_add;
Efl.Ui.Translatable.translation_update;
Elm.Widget.theme_apply;
Elm.Widget.widget_event;
Elm.Widget.focused_item { get; }
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.focused_item { get; }
Efl.Ui.Menu.selected_item { get; }
Efl.Ui.Menu.first_item { get; }
Efl.Ui.Menu.last_item { get; }

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

@ -123,7 +123,7 @@ _item_location_get(Elm_Dayselector_Data *sd,
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
_elm_dayselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;

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

@ -151,7 +151,7 @@ class Elm.Dayselector (Efl.Ui.Layout)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Translatable.translation_update;
Efl.Part.part;
}

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

@ -812,7 +812,7 @@ _theme_data_get(Evas_Object *obj)
}
EOLIAN static Efl_Ui_Theme_Apply
_elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
_elm_diskselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
{
Eina_List *l;
Elm_Diskselector_Item_Data *it;
@ -872,7 +872,7 @@ _elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
}
EOLIAN static Eina_Bool
_elm_diskselector_elm_widget_widget_sub_object_del(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *sobj)
_elm_diskselector_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *sobj)
{
Eina_Bool int_ret = EINA_FALSE;
@ -897,7 +897,7 @@ _elm_diskselector_elm_widget_widget_sub_object_del(Eo *obj, Elm_Diskselector_Dat
}
EOLIAN static Eina_Bool
_elm_diskselector_elm_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_elm_diskselector_efl_ui_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -1398,7 +1398,7 @@ _elm_diskselector_efl_canvas_group_group_member_add(Eo *obj, Elm_Diskselector_Da
}
EOLIAN static void
_elm_diskselector_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *_pd EINA_UNUSED, Eina_Bool acs)
_elm_diskselector_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *_pd EINA_UNUSED, Eina_Bool acs)
{
_elm_diskselector_smart_focus_next_enable = acs;
}

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

@ -1,4 +1,4 @@
class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
class Elm.Diskselector (Efl.Ui.Widget, Elm.Interface_Scrollable,
Efl.Access.Widget.Action,
Efl.Ui.Clickable, Efl.Ui.Scrollable,
Efl.Ui.Selectable)
@ -201,12 +201,12 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
Efl.Gfx.position { set; }
Efl.Gfx.size { set; }
Efl.Canvas.Group.group_member_add;
Elm.Widget.on_access_update;
Elm.Widget.theme_apply;
Elm.Widget.on_focus_update;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Translatable.translation_update;
Elm.Widget.widget_sub_object_del;
Elm.Widget.widget_event;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;
Elm.Interface_Scrollable.policy { get; set; }
Efl.Access.Widget.Action.elm_actions { get; }
}

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

@ -793,7 +793,7 @@ _get_drop_format(Evas_Object *obj)
/* we can't reuse layout's here, because it's on entry_edje only */
EOLIAN static Eina_Bool
_elm_entry_elm_widget_on_disabled_update(Eo *obj, Elm_Entry_Data *sd, Eina_Bool disabled)
_elm_entry_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Entry_Data *sd, Eina_Bool disabled)
{
const char *emission;
@ -853,7 +853,7 @@ _elm_entry_background_switch(Evas_Object *from_edje, Evas_Object *to_edje)
/* we can't issue the layout's theming code here, cause it assumes an
* unique edje object, always */
EOLIAN static Efl_Ui_Theme_Apply
_elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
_elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
{
const char *str;
const char *t;
@ -865,7 +865,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
// Note: We are skipping elm_layout here! This is by design.
// This assumes the following inheritance: my_class -> layout -> widget ...
theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS));
if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
evas_event_freeze(evas_object_evas_get(obj));
@ -1300,7 +1300,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
}
EOLIAN static Eina_Bool
_elm_entry_elm_widget_on_focus_update(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_entry_efl_ui_widget_on_focus_update(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
_elm_entry_focus_update(obj, sd);
@ -1308,7 +1308,7 @@ _elm_entry_elm_widget_on_focus_update(Eo *obj, Elm_Entry_Data *sd, Elm_Object_It
}
EOLIAN static Eina_Rect
_elm_entry_elm_widget_interest_region_get(Eo *obj, Elm_Entry_Data *sd)
_elm_entry_efl_ui_widget_interest_region_get(Eo *obj, Elm_Entry_Data *sd)
{
Evas_Coord cx, cy, cw, ch;
Evas_Coord edx, edy;
@ -1346,7 +1346,7 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r)
}
EOLIAN static Eina_Bool
_elm_entry_elm_widget_widget_sub_object_del(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Evas_Object *sobj)
_elm_entry_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
Eina_Bool ret = EINA_FALSE;
/* unfortunately entry doesn't follow the signal pattern
@ -5440,7 +5440,7 @@ _activate(Evas_Object *obj)
}
EOLIAN static Eina_Bool
_elm_entry_elm_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
_elm_entry_efl_ui_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
{
if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
_activate(obj);

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

@ -845,12 +845,12 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Layout.Signal.signal_callback_add;
Efl.Layout.Signal.signal_callback_del;
Efl.Layout.Signal.signal_emit;
Elm.Widget.on_access_activate;
Elm.Widget.theme_apply;
Elm.Widget.on_focus_update;
Elm.Widget.interest_region { get; }
Elm.Widget.on_disabled_update;
Elm.Widget.widget_sub_object_del;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Widget.interest_region { get; }
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;
Elm.Interface_Scrollable.policy { set; }
Elm.Interface_Scrollable.bounce_allow { set; }
Efl.Access.state_set { get; }

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

@ -35,9 +35,9 @@ class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector,
class.constructor;
class.destructor;
Efl.Object.constructor;
Elm.Widget.widget_event;
Elm.Widget.theme_apply;
Elm.Widget.focus_state_apply;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.focus_state_apply;
Elm.Interface.Fileselector.selected_models { get; }
Elm.Interface.Fileselector.selected_model_get;
Elm.Interface.Fileselector.selected_model_set;

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

@ -4,7 +4,7 @@ class Elm.Fileselector_Button (Efl.Ui.Button, Elm.Interface.Fileselector)
event_prefix: elm_fileselector_button;
implements {
Efl.Object.constructor;
Elm.Widget.theme_apply;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Autorepeat.autorepeat_supported { get; }
Elm.Interface.Fileselector.selected_models { get; }
Elm.Interface.Fileselector.expandable { get; set; }

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

@ -6,8 +6,8 @@ class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector,
implements {
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Elm.Widget.on_disabled_update;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_disabled_update;
Elm.Interface.Fileselector.selected_model_get;
Elm.Interface.Fileselector.selected_model_set;
Elm.Interface.Fileselector.folder_only { get; set; }

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