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

elm: Rename elm_layout to Efl.Ui.Layout 

Some names have not been changed, hopefully making a distinction
between legacy APIs and internal code (elm_layout_blah) and valid EO
usages.

This means many internal functions are still elm_layout_ as their
sole purpose is to support the legacy API.

Ref T5315
This commit is contained in:
Jean-Philippe Andre 2017-08-08 11:48:31 +09:00
parent db29ee1cd6
commit 9a2d4928f0
103 changed files with 375 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/POTFILES.in
View File

@ -135,7 +135,7 @@ src/lib/elementary/elm_index.c
src/lib/elementary/elm_interface_scrollable.c
src/lib/elementary/elm_inwin.c
src/lib/elementary/elm_label.c
src/lib/elementary/elm_layout.c
src/lib/elementary/efl_ui_layout.c
src/lib/elementary/elm_list.c
src/lib/elementary/elm_main.c
src/lib/elementary/elm_map.c

9
src/Makefile_Elementary.am
View File

@ -41,7 +41,7 @@ elm_public_eolian_files = \
lib/elementary/elm_interface_fileselector.eo \
lib/elementary/elm_interface_scrollable.eo \
lib/elementary/elm_label.eo \
lib/elementary/elm_layout.eo \
lib/elementary/efl_ui_layout.eo \
lib/elementary/elm_list.eo \
lib/elementary/elm_map.eo \
lib/elementary/elm_map_pan.eo \
@ -92,6 +92,7 @@ elm_public_eolian_files = \
lib/elementary/efl_ui_box_stack.eo \
lib/elementary/efl_ui_grid.eo \
lib/elementary/efl_ui_grid_static.eo \
lib/elementary/efl_ui_layout_internal_part.eo \
lib/elementary/efl_ui_layout_internal_box.eo \
lib/elementary/efl_ui_layout_internal_table.eo \
lib/elementary/efl_ui_button_internal_part.eo \
@ -101,7 +102,6 @@ elm_public_eolian_files = \
lib/elementary/elm_fileselector_entry_internal_part.eo \
lib/elementary/elm_flip_internal_part.eo \
lib/elementary/elm_hover_internal_part.eo \
lib/elementary/elm_layout_internal_part.eo \
lib/elementary/elm_mapbuf_internal_part.eo \
lib/elementary/elm_naviframe_internal_part.eo \
lib/elementary/elm_notify_internal_part.eo \
@ -430,7 +430,6 @@ includesub_HEADERS = \
lib/elementary/elm_label_legacy.h \
lib/elementary/elm_layout.h \
lib/elementary/elm_layout_common.h \
lib/elementary/elm_layout_eo.h \
lib/elementary/elm_layout_legacy.h \
lib/elementary/elm_list.h \
lib/elementary/elm_list_eo.h \
@ -618,8 +617,8 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_interface_scrollable.c \
lib/elementary/elm_inwin.c \
lib/elementary/elm_label.c \
lib/elementary/elm_layout.c \
lib/elementary/elm_layout_pack.c \
lib/elementary/efl_ui_layout.c \
lib/elementary/efl_ui_layout_pack.c \
lib/elementary/elm_list.c \
lib/elementary/elm_main.c \
lib/elementary/elm_map.c \

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

@ -123,7 +123,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
// FIXME: layout EO API
snprintf(buf, sizeof(buf), "%s/objects/test_masking.edj", elm_app_data_dir_get());
ly = efl_add(ELM_LAYOUT_CLASS, win,
ly = efl_add(EFL_UI_LAYOUT_CLASS, win,
efl_file_set(efl_added, buf, "masking"),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0));

4
src/examples/elementary/layout_example.js
View File

@ -12,7 +12,7 @@ box.setHintWeight(1.0, 1.0);
win.setContent(box);
box.setVisible(true);
ly = new Elm.Layout(box);
ly = new Efl.Ui.Layout(box);
if (!ly.setTheme("layout", "application", "titlebar"))
{
@ -41,7 +41,7 @@ end_container = ly.part('elm.swallow.end').cast('Efl.Container');
end_container.setContent(bt);
ly.emitSignal('elm,state,end,visible', 'elm');
ly = new Elm.Layout(box);
ly = new Efl.Ui.Layout(box);
filename = path.join(__dirname, 'layout_example.edj');
ly.setFile(filename, 'example/mylayout');
ly.setHintWeight(1.0, 1.0);

2
src/examples/elementary/twitter_example_01.js
View File

@ -48,7 +48,7 @@ twit.get('statuses/user_timeline', {screen_name: user_acount, count:10}, functio
var screen_name = tweets[i].user.screen_name;
var text = tweets[i].text;
var layout = new efl.Elm.Layout(win);
var layout = new efl.Efl.Ui.Layout(win);
var filename = path.join(__dirname, 'twitter_example_01.edj');
layout.setFile(filename, "tweet");

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

@ -494,7 +494,7 @@ _box_item_iterator_next(Box_Item_Iterator *it, void **data)
return EINA_TRUE;
}
static Elm_Layout *
static Eo *
_box_item_iterator_get_container(Box_Item_Iterator *it)
{
return it->object;

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

@ -437,8 +437,8 @@ EFL_TEXT_PART_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
/* Efl.Part begin */
ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
#include "efl_ui_button_internal_part.eo.c"
/* Efl.Part end */
@ -481,12 +481,12 @@ elm_button_autorepeat_get(const Evas_Object *obj)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_BUTTON_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)

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

@ -1,4 +1,4 @@
class Efl.Ui.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
Elm.Interface.Atspi_Widget_Action)
{
[[Push-button widget

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

@ -1,4 +1,4 @@
class Efl.Ui.Button.Internal.Part (Elm.Layout.Internal.Part)
class Efl.Ui.Button.Internal.Part (Efl.Ui.Layout.Internal.Part)
{
[[Elementary button internal part class]]
data: null;

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

@ -428,10 +428,10 @@ _efl_ui_check_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_CHECK_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_check), \
ELM_LAYOUT_TEXT_ALIASES_OPS()
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_check.eo.c"

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

@ -16,7 +16,7 @@ enum Efl.Ui.Clock.Type
ampm = 7, [[Indicates AM/PM field .]]
}
class Efl.Ui.Clock (Elm.Layout)
class Efl.Ui.Clock (Efl.Ui.Layout)
{
[[Efl UI clock class]]
methods {

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

@ -896,7 +896,7 @@ _iterator_next(Border_Elements_Iterator *it, void **data)
return EINA_FALSE;
}
static Elm_Layout *
static Eo *
_iterator_get_container(Border_Elements_Iterator *it)
{
return it->object;

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

@ -269,12 +269,12 @@ _efl_ui_frame_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_FRAME_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS()
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_frame.eo.c"

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

@ -1,4 +1,4 @@
class Efl.Ui.Frame (Elm.Layout, Efl.Ui.Clickable, Efl.Text)
class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text)
{
[[Frame widget

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

@ -552,7 +552,7 @@ _grid_item_iterator_next(Grid_Item_Iterator *it, void **data)
return EINA_TRUE;
}
static Elm_Layout *
static Eo *
_grid_item_iterator_get_container(Grid_Item_Iterator *it)
{
return it->object;

294
src/lib/elementary/elm_layout.c → src/lib/elementary/efl_ui_layout.c
View File

@ -10,21 +10,21 @@
#include "elm_priv.h"
#include "elm_widget_layout.h"
#include "elm_layout_internal_part.eo.h"
#include "efl_ui_layout_internal_part.eo.h"
#include "elm_part_helper.h"
#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT
#include <Edje_Edit.h>
#define MY_CLASS ELM_LAYOUT_CLASS
#define MY_CLASS_PFX elm_layout
#define MY_CLASS EFL_UI_LAYOUT_CLASS
#define MY_CLASS_PFX efl_ui_layout
#define MY_CLASS_NAME "Elm_Layout"
#define MY_CLASS_NAME_LEGACY "elm_layout"
Eo *_elm_layout_pack_proxy_get(Elm_Layout *obj, Edje_Part_Type type, const char *part);
Eo *_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part);
static void _efl_model_properties_changed_cb(void *, const Efl_Event *);
static Eina_Bool _elm_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name);
static Eina_Bool _efl_ui_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name);
static const char SIG_THEME_CHANGED[] = "theme,changed";
const char SIG_LAYOUT_FOCUSED[] = "focused";
@ -54,7 +54,7 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
{NULL, NULL}
};
static const char *_elm_layout_swallow_parts[] = {
static const char *_efl_ui_layout_swallow_parts[] = {
"elm.swallow.icon",
"elm.swallow.end",
"elm.swallow.background",
@ -71,7 +71,7 @@ struct _Elm_Layout_Sub_Iterator
{
Eina_Iterator iterator;
Eina_Iterator *real_iterator;
Elm_Layout *object;
Efl_Ui_Layout *object;
};
struct _Elm_Layout_Sub_Object_Data
@ -172,8 +172,8 @@ _icon_signal_emit(Elm_Layout_Smart_Data *sd,
if (sub_d->type != SWALLOW) return;
for (i = 0;; i++)
{
if (!_elm_layout_swallow_parts[i]) return;
if (!strcmp(sub_d->part, _elm_layout_swallow_parts[i])) break;
if (!_efl_ui_layout_swallow_parts[i]) return;
if (!strcmp(sub_d->part, _efl_ui_layout_swallow_parts[i])) break;
}
if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
@ -286,7 +286,7 @@ _parts_cursors_apply(Elm_Layout_Smart_Data *sd)
}
static void
_elm_layout_highlight_in_theme(Evas_Object *obj)
_efl_ui_layout_highlight_in_theme(Evas_Object *obj)
{
const char *fh;
@ -325,7 +325,7 @@ _visuals_refresh(Evas_Object *obj,
(wd->resize_obj,
efl_ui_scale_get(obj) * elm_config_scale_get());
_elm_layout_highlight_in_theme(obj);
_efl_ui_layout_highlight_in_theme(obj);
ret = elm_obj_widget_disable(obj);
@ -335,7 +335,7 @@ _visuals_refresh(Evas_Object *obj,
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_disable(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
_efl_ui_layout_elm_widget_disable(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -350,7 +350,7 @@ _elm_layout_elm_widget_disable(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
}
static Elm_Theme_Apply
_elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
{
Elm_Theme_Apply ret = ELM_THEME_APPLY_FAILED;
@ -365,7 +365,7 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
}
if (ret)
efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
if (!_visuals_refresh(obj, sd))
ret = ELM_THEME_APPLY_FAILED;
@ -374,19 +374,19 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
}
EOLIAN static Elm_Theme_Apply
_elm_layout_elm_widget_theme_apply(Eo *obj, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_elm_widget_theme_apply(Eo *obj, Elm_Layout_Smart_Data *sd)
{
Elm_Theme_Apply theme_apply = ELM_THEME_APPLY_FAILED;
theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!theme_apply) return ELM_THEME_APPLY_FAILED;
theme_apply &= _elm_layout_theme_internal(obj, sd);
theme_apply &= _efl_ui_layout_theme_internal(obj, sd);
return theme_apply;
}
static void *
_elm_layout_list_data_get(const Eina_List *list)
_efl_ui_layout_list_data_get(const Eina_List *list)
{
Elm_Layout_Sub_Object_Data *sub_d = eina_list_data_get(list);
@ -394,7 +394,7 @@ _elm_layout_list_data_get(const Eina_List *list)
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -423,7 +423,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
_efl_ui_layout_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
if (!elm_widget_can_focus_get(obj))
return EINA_TRUE;
@ -467,7 +467,7 @@ _access_focus_list_sort(Eina_List *origin)
* child objects, but still inheriting from elm_layout, just set its
* focus_next smart function back to NULL */
EOLIAN static Eina_Bool
_elm_layout_elm_widget_focus_next(Eo *obj, Elm_Layout_Smart_Data *sd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
_efl_ui_layout_elm_widget_focus_next(Eo *obj, Elm_Layout_Smart_Data *sd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
{
const Eina_List *items;
void *(*list_data_get)(const Eina_List *list);
@ -477,7 +477,7 @@ _elm_layout_elm_widget_focus_next(Eo *obj, Elm_Layout_Smart_Data *sd, Elm_Focus_
else
{
items = sd->subs;
list_data_get = _elm_layout_list_data_get;
list_data_get = _efl_ui_layout_list_data_get;
if (!items) return EINA_FALSE;
@ -490,7 +490,7 @@ _elm_layout_elm_widget_focus_next(Eo *obj, Elm_Layout_Smart_Data *sd, Elm_Focus_
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_sub_object_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Evas_Object *sobj)
_efl_ui_layout_elm_widget_sub_object_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
Eina_Bool int_ret = EINA_FALSE;
@ -507,7 +507,7 @@ _elm_layout_elm_widget_sub_object_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_U
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_Object *sobj)
_efl_ui_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_Object *sobj)
{
Eina_List *l;
Elm_Layout_Sub_Object_Data *sub_d;
@ -544,7 +544,7 @@ _elm_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_O
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
_efl_ui_layout_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
if (!elm_widget_can_focus_get(obj))
return EINA_TRUE;
@ -553,7 +553,7 @@ _elm_layout_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Layou
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_focus_direction(Eo *obj, Elm_Layout_Smart_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
_efl_ui_layout_elm_widget_focus_direction(Eo *obj, Elm_Layout_Smart_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
{
const Eina_List *items;
void *(*list_data_get)(const Eina_List *list);
@ -566,7 +566,7 @@ _elm_layout_elm_widget_focus_direction(Eo *obj, Elm_Layout_Smart_Data *sd, const
else
{
items = sd->subs;
list_data_get = _elm_layout_list_data_get;
list_data_get = _efl_ui_layout_list_data_get;
if (!items) return EINA_FALSE;
}
@ -647,7 +647,7 @@ _sub_box_remove(Evas_Object *obj,
Elm_Layout_Sub_Object_Data *sub_d)
{
Evas_Object *child = sub_d->obj; /* sub_d will die in
* _elm_layout_smart_sub_object_del */
* _efl_ui_layout_smart_sub_object_del */
if (sub_d->type == BOX_INSERT_BEFORE)
evas_object_event_callback_del_full
@ -692,7 +692,7 @@ _sub_table_remove(Evas_Object *obj,
Evas_Object *child;
ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd, NULL);
child = sub_d->obj; /* sub_d will die in _elm_layout_smart_sub_object_del */
child = sub_d->obj; /* sub_d will die in _efl_ui_layout_smart_sub_object_del */
edje_object_part_table_unpack
(wd->resize_obj, sub_d->part, child);
@ -718,7 +718,7 @@ _on_size_evaluate_signal(void *data,
}
EOLIAN static void
_elm_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
_efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
Evas_Object *edje;
@ -739,7 +739,7 @@ _elm_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_
}
EOLIAN static void
_elm_layout_efl_canvas_group_group_del(Eo *obj, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Elm_Layout_Smart_Data *sd)
{
Elm_Layout_Sub_Object_Data *sub_d;
Elm_Layout_Sub_Object_Cursor *pc;
@ -804,7 +804,7 @@ _elm_layout_efl_canvas_group_group_del(Eo *obj, Elm_Layout_Smart_Data *sd)
/* rewrite or extend this one on your derived class as to suit your
* needs */
EOLIAN static void
_elm_layout_efl_canvas_group_group_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_canvas_group_group_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
{
if (sd->needs_size_calc)
{
@ -833,7 +833,7 @@ _parts_cursors_find(Elm_Layout_Smart_Data *sd,
* widget inheriting from elm_layout */
EOLIAN static Eina_Bool
_elm_layout_efl_file_file_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *file, const char *group)
_efl_ui_layout_efl_file_file_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *file, const char *group)
{
Eina_Bool int_ret = EINA_FALSE;
@ -857,7 +857,7 @@ _elm_layout_efl_file_file_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *fi
}
EOLIAN static void
_elm_layout_efl_file_file_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char **file, const char **group)
_efl_ui_layout_efl_file_file_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char **file, const char **group)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
edje_object_file_get(wd->resize_obj, file, group);
@ -865,7 +865,7 @@ _elm_layout_efl_file_file_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, co
EOLIAN static Eina_Bool
_elm_layout_efl_file_mmap_set(Eo *obj, Elm_Layout_Smart_Data *sd, const Eina_File *file, const char *group)
_efl_ui_layout_efl_file_mmap_set(Eo *obj, Elm_Layout_Smart_Data *sd, const Eina_File *file, const char *group)
{
Eina_Bool int_ret = EINA_FALSE;
@ -889,14 +889,14 @@ _elm_layout_efl_file_mmap_set(Eo *obj, Elm_Layout_Smart_Data *sd, const Eina_Fil
}
EOLIAN static void
_elm_layout_efl_file_mmap_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const Eina_File **file, const char **group)
_efl_ui_layout_efl_file_mmap_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const Eina_File **file, const char **group)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
efl_file_mmap_get(wd->resize_obj, file, group);
}
EOLIAN static Eina_Bool
_elm_layout_theme_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *klass, const char *group, const char *style)
_efl_ui_layout_theme_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *klass, const char *group, const char *style)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -905,14 +905,14 @@ _elm_layout_theme_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *klass, con
eina_stringshare_replace(&(sd->group), group);
eina_stringshare_replace(&(wd->style), style);
if (_elm_layout_theme_internal(obj, sd))
if (_efl_ui_layout_theme_internal(obj, sd))
return EINA_TRUE;
else
return EINA_FALSE;
}
EOLIAN static void
_elm_layout_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source)
_efl_ui_layout_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source)
{
// Don't do anything else than call forward here
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -920,7 +920,7 @@ _elm_layout_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Layout_Smart_Data
}
EOLIAN static Eina_Bool
_elm_layout_efl_canvas_layout_signal_signal_callback_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
_efl_ui_layout_efl_canvas_layout_signal_signal_callback_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
{
// Don't do anything else than call forward here
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -928,7 +928,7 @@ _elm_layout_efl_canvas_layout_signal_signal_callback_add(Eo *obj, Elm_Layout_Sma
}
EOLIAN static Eina_Bool
_elm_layout_efl_canvas_layout_signal_signal_callback_del(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
_efl_ui_layout_efl_canvas_layout_signal_signal_callback_del(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
{
// Don't do anything else than call forward here
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -955,7 +955,7 @@ elm_layout_content_set(Evas_Object *obj,
}
static Eina_Bool
_elm_layout_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *content)
_efl_ui_layout_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *content)
{
Elm_Layout_Sub_Object_Data *sub_d;
const Eina_List *l;
@ -1036,7 +1036,7 @@ elm_layout_content_get(const Evas_Object *obj,
}
static Evas_Object*
_elm_layout_content_get(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
_efl_ui_layout_content_get(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
{
const Eina_List *l;
Elm_Layout_Sub_Object_Data *sub_d;
@ -1066,7 +1066,7 @@ elm_layout_content_unset(Evas_Object *obj,
}
static Evas_Object*
_elm_layout_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
_efl_ui_layout_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
{
Elm_Layout_Sub_Object_Data *sub_d;
const Eina_List *l;
@ -1085,7 +1085,7 @@ _elm_layout_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
if (!sub_d->obj) return NULL;
content = sub_d->obj; /* sub_d will die in
* _elm_layout_smart_sub_object_del */
* _efl_ui_layout_smart_sub_object_del */
if (!_elm_widget_sub_object_redirect_to_top(obj, content))
{
@ -1104,25 +1104,25 @@ _elm_layout_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
}
EOLIAN static Eina_Bool
_elm_layout_efl_container_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_Object *content)
_efl_ui_layout_efl_container_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_Object *content)
{
return _elm_layout_content_set(obj, sd, NULL, content);
return _efl_ui_layout_content_set(obj, sd, NULL, content);
}
EOLIAN static Evas_Object*
_elm_layout_efl_container_content_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_container_content_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
{
return _elm_layout_content_get(obj, sd, NULL);
return _efl_ui_layout_content_get(obj, sd, NULL);
}
EOLIAN static Evas_Object*
_elm_layout_efl_container_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_container_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd)
{
return _elm_layout_content_unset(obj, sd, NULL);
return _efl_ui_layout_content_unset(obj, sd, NULL);
}
EOLIAN static Eina_Bool
_elm_layout_efl_container_content_remove(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
_efl_ui_layout_efl_container_content_remove(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
Efl_Gfx *content)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -1169,7 +1169,7 @@ _sub_iterator_next(Elm_Layout_Sub_Iterator *it, void **data)
return EINA_TRUE;
}
static Elm_Layout *
static Efl_Ui_Layout *
_sub_iterator_get_container(Elm_Layout_Sub_Iterator *it)
{
return it->object;
@ -1203,19 +1203,19 @@ _sub_iterator_create(Eo *eo_obj, Elm_Layout_Smart_Data *sd)
}
EOLIAN static Eina_Iterator *
_elm_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
{
return _sub_iterator_create(eo_obj, sd);
}
EOLIAN static int
_elm_layout_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
{
return eina_list_count(sd->subs);
}
EOLIAN static Eina_Bool
_elm_layout_text_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, const char *text)
_efl_ui_layout_text_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, const char *text)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -1286,7 +1286,7 @@ _elm_layout_text_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, const
}
EOLIAN static const char*
_elm_layout_text_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char *part)
_efl_ui_layout_text_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char *part)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
@ -1306,7 +1306,7 @@ _layout_box_subobj_init(Elm_Layout_Smart_Data *sd, Elm_Layout_Sub_Object_Data *s
}
Eina_Bool
_elm_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
_efl_ui_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
{
Elm_Layout_Sub_Object_Data *sub_d;
@ -1343,7 +1343,7 @@ _elm_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
}
Eina_Bool
_elm_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
_efl_ui_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
{
Elm_Layout_Sub_Object_Data *sub_d;
@ -1380,7 +1380,7 @@ _elm_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Ev
}
Eina_Bool
_elm_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference)
_efl_ui_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference)
{
Elm_Layout_Sub_Object_Data *sub_d;
@ -1422,7 +1422,7 @@ _elm_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *pa
}
Eina_Bool
_elm_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned int pos)
_efl_ui_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned int pos)
{
Elm_Layout_Sub_Object_Data *sub_d;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -1460,7 +1460,7 @@ _elm_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part,
}
Evas_Object *
_elm_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
_efl_ui_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
@ -1481,7 +1481,7 @@ _elm_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
}
Eina_Bool
_elm_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear)
_efl_ui_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE);
@ -1511,7 +1511,7 @@ _elm_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part,
}
Eina_Bool
_elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
_efl_ui_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
{
Elm_Layout_Sub_Object_Data *sub_d;
@ -1558,7 +1558,7 @@ _elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
}
Evas_Object *
_elm_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
_efl_ui_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
@ -1580,7 +1580,7 @@ _elm_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, E
}
Eina_Bool
_elm_layout_table_clear(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear)
_efl_ui_layout_table_clear(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE);
@ -1618,7 +1618,7 @@ elm_layout_edje_get(const Eo *obj)
}
EOLIAN static const char *
_elm_layout_efl_canvas_layout_group_group_data_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *key)
_efl_ui_layout_efl_canvas_layout_group_group_data_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *key)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
@ -1626,7 +1626,7 @@ _elm_layout_efl_canvas_layout_group_group_data_get(Eo *obj, Elm_Layout_Smart_Dat
}
EOLIAN static void
_elm_layout_efl_canvas_layout_group_group_size_min_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, int *w, int *h)
_efl_ui_layout_efl_canvas_layout_group_group_size_min_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, int *w, int *h)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -1634,7 +1634,7 @@ _elm_layout_efl_canvas_layout_group_group_size_min_get(Eo *obj, Elm_Layout_Smart
}
EOLIAN static void
_elm_layout_efl_canvas_layout_group_group_size_max_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, int *w, int *h)
_efl_ui_layout_efl_canvas_layout_group_group_size_max_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, int *w, int *h)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -1644,7 +1644,7 @@ _elm_layout_efl_canvas_layout_group_group_size_max_get(Eo *obj, Elm_Layout_Smart
/* layout's sizing evaluation is deferred. evaluation requests are
* queued up and only flag the object as 'changed'. when it comes to
* Evas's rendering phase, it will be addressed, finally (see
* _elm_layout_smart_calculate()). */
* _efl_ui_layout_smart_calculate()). */
static void
_elm_layout_sizing_eval(Eo *obj, Elm_Layout_Smart_Data *sd)
{
@ -1668,7 +1668,7 @@ elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
}
EOLIAN static int
_elm_layout_efl_canvas_layout_calc_calc_freeze(Eo *obj, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_canvas_layout_calc_calc_freeze(Eo *obj, Elm_Layout_Smart_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
@ -1680,7 +1680,7 @@ _elm_layout_efl_canvas_layout_calc_calc_freeze(Eo *obj, Elm_Layout_Smart_Data *s
}
EOLIAN static int
_elm_layout_efl_canvas_layout_calc_calc_thaw(Eo *obj, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_canvas_layout_calc_calc_thaw(Eo *obj, Elm_Layout_Smart_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
@ -1694,7 +1694,7 @@ _elm_layout_efl_canvas_layout_calc_calc_thaw(Eo *obj, Elm_Layout_Smart_Data *sd)
}
static Eina_Bool
_elm_layout_part_cursor_set(Elm_Layout_Smart_Data *sd, const char *part_name, const char *cursor)
_efl_ui_layout_part_cursor_set(Elm_Layout_Smart_Data *sd, const char *part_name, const char *cursor)
{
Evas_Object *part_obj;
Elm_Layout_Sub_Object_Cursor *pc;
@ -1703,7 +1703,7 @@ _elm_layout_part_cursor_set(Elm_Layout_Smart_Data *sd, const char *part_name, co
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
if (!cursor) return _elm_layout_part_cursor_unset(sd, part_name);
if (!cursor) return _efl_ui_layout_part_cursor_unset(sd, part_name);
part_obj = (Evas_Object *)edje_object_part_object_get
(wd->resize_obj, part_name);
@ -1750,7 +1750,7 @@ _elm_layout_part_cursor_set(Elm_Layout_Smart_Data *sd, const char *part_name, co
}
static const char *
_elm_layout_part_cursor_get(Elm_Layout_Smart_Data *sd, const char *part_name)
_efl_ui_layout_part_cursor_get(Elm_Layout_Smart_Data *sd, const char *part_name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL);
@ -1762,7 +1762,7 @@ _elm_layout_part_cursor_get(Elm_Layout_Smart_Data *sd, const char *part_name)
}
static Eina_Bool
_elm_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name)
_efl_ui_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
@ -1784,7 +1784,7 @@ _elm_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name)
}
static Eina_Bool
_elm_layout_part_cursor_style_set(Elm_Layout_Smart_Data *sd, const char *part_name, const char *style)
_efl_ui_layout_part_cursor_style_set(Elm_Layout_Smart_Data *sd, const char *part_name, const char *style)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
@ -1799,7 +1799,7 @@ _elm_layout_part_cursor_style_set(Elm_Layout_Smart_Data *sd, const char *part_na
}
static const char*
_elm_layout_part_cursor_style_get(Elm_Layout_Smart_Data *sd, const char *part_name)
_efl_ui_layout_part_cursor_style_get(Elm_Layout_Smart_Data *sd, const char *part_name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL);
@ -1811,7 +1811,7 @@ _elm_layout_part_cursor_style_get(Elm_Layout_Smart_Data *sd, const char *part_na
}
static Eina_Bool
_elm_layout_part_cursor_engine_only_set(Elm_Layout_Smart_Data *sd, const char *part_name, Eina_Bool engine_only)
_efl_ui_layout_part_cursor_engine_only_set(Elm_Layout_Smart_Data *sd, const char *part_name, Eina_Bool engine_only)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
@ -1826,7 +1826,7 @@ _elm_layout_part_cursor_engine_only_set(Elm_Layout_Smart_Data *sd, const char *p
}
static Eina_Bool
_elm_layout_part_cursor_engine_only_get(Elm_Layout_Smart_Data *sd, const char *part_name)
_efl_ui_layout_part_cursor_engine_only_get(Elm_Layout_Smart_Data *sd, const char *part_name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
@ -1855,7 +1855,7 @@ elm_layout_edje_object_can_access_get(const Eo *obj)
}
EOLIAN static void
_elm_layout_efl_object_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
_efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
{
efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd);
@ -1954,7 +1954,7 @@ _prop_future_then_cb(void* data, Efl_Event const*event)
}
static void
_elm_layout_view_model_update(Elm_Layout_Smart_Data *pd)
_efl_ui_layout_view_model_update(Elm_Layout_Smart_Data *pd)
{
Elm_Layout_Sub_Property_Future *sub_pp;
Efl_Future **future_arr, **f, *future_all;
@ -2042,7 +2042,7 @@ _efl_model_properties_changed_cb(void *data, const Efl_Event *event)
}
EOLIAN static void
_elm_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, Efl_Model *model)
_efl_ui_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, Efl_Model *model)
{
if (pd->model)
{
@ -2061,7 +2061,7 @@ _elm_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd
return;
if (pd->prop_connect)
_elm_layout_view_model_update(pd);
_efl_ui_layout_view_model_update(pd);
if (pd->factories)
{
@ -2093,13 +2093,13 @@ _elm_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd
}
EOLIAN static Efl_Model *
_elm_layout_efl_ui_view_model_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd)
_efl_ui_layout_efl_ui_view_model_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd)
{
return pd->model;
}
EOLIAN static void
_elm_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, const char *name, const char *property)
_efl_ui_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, const char *name, const char *property)
{
EINA_SAFETY_ON_NULL_RETURN(name);
Eina_Stringshare *ss_name, *ss_prop;
@ -2141,7 +2141,7 @@ _elm_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_D
EOLIAN static void
_elm_layout_efl_ui_model_factory_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd,
_efl_ui_layout_efl_ui_model_factory_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd,
const char *name, Efl_Ui_Factory *factory)
{
EINA_SAFETY_ON_NULL_RETURN(name);
@ -2180,7 +2180,7 @@ elm_layout_add(Evas_Object *parent)
}
EOLIAN static Eo *
_elm_layout_efl_object_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
_efl_ui_layout_efl_object_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
{
sd->obj = obj;
obj = efl_constructor(efl_super(obj, MY_CLASS));
@ -2191,20 +2191,20 @@ _elm_layout_efl_object_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
return obj;
}
EOLIAN static void _elm_layout_class_constructor(Efl_Class *klass)
EOLIAN static void _efl_ui_layout_class_constructor(Efl_Class *klass)
{
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
EOLIAN static void
_elm_layout_efl_canvas_layout_signal_message_send(Eo *obj, Elm_Layout_Smart_Data *pd EINA_UNUSED, int id, const Eina_Value msg)
_efl_ui_layout_efl_canvas_layout_signal_message_send(Eo *obj, Elm_Layout_Smart_Data *pd EINA_UNUSED, int id, const Eina_Value msg)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
efl_canvas_layout_signal_message_send(wd->resize_obj, id, msg);
}
EOLIAN static void
_elm_layout_efl_canvas_layout_signal_signal_process(Eo *obj, Elm_Layout_Smart_Data *pd EINA_UNUSED, Eina_Bool recurse)
_efl_ui_layout_efl_canvas_layout_signal_signal_process(Eo *obj, Elm_Layout_Smart_Data *pd EINA_UNUSED, Eina_Bool recurse)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
efl_canvas_layout_signal_process(wd->resize_obj, recurse);
@ -2238,31 +2238,31 @@ elm_layout_mmap_get(Eo *obj, const Eina_File **file, const char **group)
}
EAPI Eina_Bool
elm_layout_box_append(Elm_Layout *obj, const char *part, Evas_Object *child)
elm_layout_box_append(Eo *obj, const char *part, Evas_Object *child)
{
return efl_pack(efl_part(obj, part), child);
}
EAPI Eina_Bool
elm_layout_box_prepend(Elm_Layout *obj, const char *part, Evas_Object *child)
elm_layout_box_prepend(Eo *obj, const char *part, Evas_Object *child)
{
return efl_pack_begin(efl_part(obj, part), child);
}
EAPI Eina_Bool
elm_layout_box_insert_before(Elm_Layout *obj, const char *part, Evas_Object *child, const Evas_Object *reference)
elm_layout_box_insert_before(Eo *obj, const char *part, Evas_Object *child, const Evas_Object *reference)
{
return efl_pack_before(efl_part(obj, part), child, reference);
}
EAPI Eina_Bool
elm_layout_box_insert_at(Elm_Layout *obj, const char *part, Evas_Object *child, unsigned int pos)
elm_layout_box_insert_at(Eo *obj, const char *part, Evas_Object *child, unsigned int pos)
{
return efl_pack_at(efl_part(obj, part), child, pos);
}
EAPI Evas_Object *
elm_layout_box_remove(Elm_Layout *obj, const char *part, Evas_Object *child)
elm_layout_box_remove(Eo *obj, const char *part, Evas_Object *child)
{
if (!efl_pack_unpack(efl_part(obj, part), child))
return NULL;
@ -2270,7 +2270,7 @@ elm_layout_box_remove(Elm_Layout *obj, const char *part, Evas_Object *child)
}
EAPI Eina_Bool
elm_layout_box_remove_all(Elm_Layout *obj, const char *part, Eina_Bool clear)
elm_layout_box_remove_all(Eo *obj, const char *part, Eina_Bool clear)
{
if (clear)
return efl_pack_clear(efl_part(obj, part));
@ -2279,13 +2279,13 @@ elm_layout_box_remove_all(Elm_Layout *obj, const char *part, Eina_Bool clear)
}
EAPI Eina_Bool
elm_layout_table_pack(Elm_Layout *obj, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
elm_layout_table_pack(Eo *obj, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
{
return efl_pack_grid(efl_part(obj, part), child, col, row, colspan, rowspan);
}
EAPI Evas_Object *
elm_layout_table_unpack(Elm_Layout *obj, const char *part, Evas_Object *child)
elm_layout_table_unpack(Eo *obj, const char *part, Evas_Object *child)
{
if (!efl_pack_unpack(efl_part(obj, part), child))
return NULL;
@ -2293,7 +2293,7 @@ elm_layout_table_unpack(Elm_Layout *obj, const char *part, Evas_Object *child)
}
EAPI Eina_Bool
elm_layout_table_clear(Elm_Layout *obj, const char *part, Eina_Bool clear)
elm_layout_table_clear(Eo *obj, const char *part, Eina_Bool clear)
{
if (clear)
return efl_pack_clear(efl_part(obj, part));
@ -2302,7 +2302,7 @@ elm_layout_table_clear(Elm_Layout *obj, const char *part, Eina_Bool clear)
}
EAPI Eina_Bool
elm_layout_text_set(Elm_Layout *obj, const char *part, const char *text)
elm_layout_text_set(Eo *obj, const char *part, const char *text)
{
if (!part)
{
@ -2314,7 +2314,7 @@ elm_layout_text_set(Elm_Layout *obj, const char *part, const char *text)
}
EAPI const char *
elm_layout_text_get(const Elm_Layout *obj, const char *part)
elm_layout_text_get(const Eo *obj, const char *part)
{
if (!part)
{
@ -2325,43 +2325,43 @@ elm_layout_text_get(const Elm_Layout *obj, const char *part)
}
EAPI Eina_Bool
elm_layout_part_cursor_engine_only_set(Elm_Layout *obj, const char *part, Eina_Bool engine_only)
elm_layout_part_cursor_engine_only_set(Eo *obj, const char *part, Eina_Bool engine_only)
{
return efl_ui_cursor_theme_search_enabled_set(efl_part(obj, part), !engine_only);
}
EAPI Eina_Bool
elm_layout_part_cursor_engine_only_get(const Elm_Layout *obj, const char *part)
elm_layout_part_cursor_engine_only_get(const Eo *obj, const char *part)
{
return !efl_ui_cursor_theme_search_enabled_get(efl_part(obj, part));
}
EAPI Eina_Bool
elm_layout_part_cursor_set(Elm_Layout *obj, const char *part, const char *cursor)
elm_layout_part_cursor_set(Eo *obj, const char *part, const char *cursor)
{
return efl_ui_cursor_set(efl_part(obj, part), cursor);
}
EAPI const char *
elm_layout_part_cursor_get(const Elm_Layout *obj, const char *part)
elm_layout_part_cursor_get(const Eo *obj, const char *part)
{
return efl_ui_cursor_get(efl_part(obj, part));
}
EAPI Eina_Bool
elm_layout_part_cursor_style_set(Elm_Layout *obj, const char *part, const char *style)
elm_layout_part_cursor_style_set(Eo *obj, const char *part, const char *style)
{
return efl_ui_cursor_style_set(efl_part(obj, part), style);
}
EAPI const char *
elm_layout_part_cursor_style_get(const Elm_Layout *obj, const char *part)
elm_layout_part_cursor_style_get(const Eo *obj, const char *part)
{
return efl_ui_cursor_style_get(efl_part(obj, part));
}
EAPI Eina_Bool
elm_layout_part_cursor_unset(Elm_Layout *obj, const char *part)
elm_layout_part_cursor_unset(Eo *obj, const char *part)
{
return efl_ui_cursor_set(efl_part(obj, part), NULL);
}
@ -2400,7 +2400,7 @@ _elm_layout_signal_callback_add_legacy(Eo *obj, Eo *edje, Eina_List **p_edje_sig
}
EAPI void
elm_layout_signal_callback_add(Elm_Layout *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
elm_layout_signal_callback_add(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
{
Elm_Layout_Smart_Data *sd;
@ -2454,7 +2454,7 @@ _elm_layout_signal_callback_del_legacy(Eo *obj EINA_UNUSED, Eo *edje, Eina_List
}
EAPI void *
elm_layout_signal_callback_del(Elm_Layout *obj, const char *emission, const char *source, Edje_Signal_Cb func)
elm_layout_signal_callback_del(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func)
{
Elm_Layout_Smart_Data *sd;
@ -2472,7 +2472,7 @@ elm_layout_signal_callback_del(Elm_Layout *obj, const char *emission, const char
}
EAPI void
elm_layout_signal_emit(Elm_Layout *obj, const char *emission, const char *source)
elm_layout_signal_emit(Eo *obj, const char *emission, const char *source)
{
efl_canvas_layout_signal_emit(obj, emission, source);
}
@ -2489,7 +2489,7 @@ elm_layout_data_get(const Evas_Object *obj, const char *key)
/* Efl.Part implementation */
static EOLIAN Efl_Object *
_elm_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
_efl_ui_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
const char *part)
{
Edje_Part_Type type;
@ -2503,15 +2503,15 @@ _elm_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
// has side effects (it calls recalc, which may be really bad).
type = edje_edit_part_type_get(wd->resize_obj, part);
if ((type == EDJE_PART_TYPE_BOX) || (type == EDJE_PART_TYPE_TABLE))
return _elm_layout_pack_proxy_get((Eo *) obj, type, part);
return _efl_ui_layout_pack_proxy_get((Eo *) obj, type, part);
// Generic parts (text, anything, ...)
proxy = efl_add(ELM_LAYOUT_INTERNAL_PART_CLASS, (Eo *) obj);
pd = efl_data_scope_get(proxy, ELM_LAYOUT_INTERNAL_PART_CLASS);
proxy = efl_add(EFL_UI_LAYOUT_INTERNAL_PART_CLASS, (Eo *) obj);
pd = efl_data_scope_get(proxy, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
if (pd)
{
pd->obj = (Eo *) obj;
pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, proxy);
pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, proxy);
pd->part = strdup(part);
pd->temp = 1;
}
@ -2520,7 +2520,7 @@ _elm_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
}
static const char *
_elm_layout_default_content_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED)
_efl_ui_layout_default_content_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED)
{
const char *part = NULL;
if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE))
@ -2529,7 +2529,7 @@ _elm_layout_default_content_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EI
}
static const char *
_elm_layout_default_text_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED)
_efl_ui_layout_default_text_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED)
{
const char *part = NULL;
if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
@ -2538,48 +2538,48 @@ _elm_layout_default_text_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_
}
EOLIAN static Eina_Bool
_elm_layout_internal_part_efl_ui_cursor_cursor_set(Eo *obj, Elm_Part_Data *pd, const char *cursor)
_efl_ui_layout_internal_part_efl_ui_cursor_cursor_set(Eo *obj, Elm_Part_Data *pd, const char *cursor)
{
ELM_PART_RETURN_VAL(_elm_layout_part_cursor_set(pd->sd, pd->part, cursor));
ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_set(pd->sd, pd->part, cursor));
}
EOLIAN static const char *
_elm_layout_internal_part_efl_ui_cursor_cursor_get(Eo *obj, Elm_Part_Data *pd)
_efl_ui_layout_internal_part_efl_ui_cursor_cursor_get(Eo *obj, Elm_Part_Data *pd)
{
ELM_PART_RETURN_VAL(_elm_layout_part_cursor_get(pd->sd, pd->part));
ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_get(pd->sd, pd->part));
}
EOLIAN static Eina_Bool
_elm_layout_internal_part_efl_ui_cursor_cursor_style_set(Eo *obj, Elm_Part_Data *pd, const char *style)
_efl_ui_layout_internal_part_efl_ui_cursor_cursor_style_set(Eo *obj, Elm_Part_Data *pd, const char *style)
{
ELM_PART_RETURN_VAL(_elm_layout_part_cursor_style_set(pd->sd, pd->part, style));
ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_set(pd->sd, pd->part, style));
}
EOLIAN static const char *
_elm_layout_internal_part_efl_ui_cursor_cursor_style_get(Eo *obj, Elm_Part_Data *pd)
_efl_ui_layout_internal_part_efl_ui_cursor_cursor_style_get(Eo *obj, Elm_Part_Data *pd)
{
ELM_PART_RETURN_VAL(_elm_layout_part_cursor_style_get(pd->sd, pd->part));
ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_get(pd->sd, pd->part));
}
EOLIAN static Eina_Bool
_elm_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, Elm_Part_Data *pd, Eina_Bool allow)
_efl_ui_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, Elm_Part_Data *pd, Eina_Bool allow)
{
ELM_PART_RETURN_VAL(_elm_layout_part_cursor_engine_only_set(pd->sd, pd->part, !allow));
ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_engine_only_set(pd->sd, pd->part, !allow));
}
EOLIAN static Eina_Bool
_elm_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_get(Eo *obj, Elm_Part_Data *pd)
_efl_ui_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_get(Eo *obj, Elm_Part_Data *pd)
{
ELM_PART_RETURN_VAL(!_elm_layout_part_cursor_engine_only_get(pd->sd, pd->part));
ELM_PART_RETURN_VAL(!_efl_ui_layout_part_cursor_engine_only_get(pd->sd, pd->part));
}
ELM_PART_IMPLEMENT_DESTRUCTOR(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_CONTENT_SET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_CONTENT_GET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_TEXT_SET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_TEXT_GET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
#include "elm_layout_internal_part.eo.c"
ELM_PART_IMPLEMENT_DESTRUCTOR(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_CONTENT_SET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_TEXT_SET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
ELM_PART_IMPLEMENT_TEXT_GET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
#include "efl_ui_layout_internal_part.eo.c"
/* Efl.Part end */
@ -2590,16 +2590,16 @@ EAPI EFL_VOID_FUNC_BODY(elm_layout_sizing_eval)
EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_LAYOUT_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_layout), \
ELM_PART_CONTENT_DEFAULT_OPS(elm_layout), \
ELM_PART_TEXT_DEFAULT_OPS(elm_layout), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
#define EFL_UI_LAYOUT_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout), \
ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout), \
ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval), \
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_layout_efl_object_dbg_info_get)
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_efl_object_dbg_info_get)
#include "elm_layout.eo.c"
#include "efl_ui_layout.eo.c"

4
src/lib/elementary/elm_layout.eo → src/lib/elementary/efl_ui_layout.eo
View File

@ -1,14 +1,12 @@
import edje_types;
class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect,
Efl.Canvas.Layout_Calc, Efl.Canvas.Layout_Signal,
Efl.Canvas.Layout_Group)
{
[[Elementary layout class]]
legacy_prefix: elm_layout;
eo_prefix: elm_obj_layout;
event_prefix: elm_layout;
data: Elm_Layout_Smart_Data;
methods {
@property theme {

2
src/lib/elementary/elm_layout_internal_part.eo → src/lib/elementary/efl_ui_layout_internal_part.eo
View File

@ -1,4 +1,4 @@
class Elm.Layout.Internal.Part (Efl.Object, Efl.Container, Efl.Text,
class Efl.Ui.Layout.Internal.Part (Efl.Object, Efl.Container, Efl.Text,
Efl.Ui.Cursor)
{
[[Elementary layout internal part class]]

52
src/lib/elementary/elm_layout_pack.c → src/lib/elementary/efl_ui_layout_pack.c
View File

@ -18,15 +18,15 @@
#include "../evas/canvas/evas_table.eo.h"
/* layout internals for box & table */
Eina_Bool _elm_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
Eina_Bool _elm_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
Eina_Bool _elm_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference);
Eina_Bool _elm_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned int pos);
Evas_Object *_elm_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
Eina_Bool _elm_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear);
Eina_Bool _elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
Evas_Object *_elm_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
Eina_Bool _elm_layout_table_clear(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear);
Eina_Bool _efl_ui_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
Eina_Bool _efl_ui_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
Eina_Bool _efl_ui_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference);
Eina_Bool _efl_ui_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned int pos);
Evas_Object *_efl_ui_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
Eina_Bool _efl_ui_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear);
Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear);
#define BOX_CLASS EFL_UI_LAYOUT_INTERNAL_BOX_CLASS
#define TABLE_CLASS EFL_UI_LAYOUT_INTERNAL_TABLE_CLASS
@ -37,7 +37,7 @@ typedef struct _Part_Item_Iterator Part_Item_Iterator;
struct _Layout_Part_Data
{
Elm_Layout *obj; // no ref
Efl_Ui_Layout *obj; // no ref
Elm_Layout_Smart_Data *sd; // data xref
Eina_Stringshare *part;
unsigned char temp;
@ -52,7 +52,7 @@ struct _Part_Item_Iterator
};
Eo *
_elm_layout_pack_proxy_get(Elm_Layout *obj, Edje_Part_Type type, const char *part)
_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part)
{
if (type == EDJE_PART_TYPE_BOX)
return efl_add(BOX_CLASS, obj,
@ -77,7 +77,7 @@ EOLIAN static void
_efl_ui_layout_internal_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part)
{
pd->obj = layout;
pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, obj);
pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj);
eina_stringshare_replace(&pd->part, part);
pd->temp = 1;
}
@ -151,19 +151,19 @@ _efl_ui_layout_internal_box_efl_container_content_count(Eo *obj EINA_UNUSED, Efl
EOLIAN static Eina_Bool
_efl_ui_layout_internal_box_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
{
ELM_PART_RETURN_VAL(_elm_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_TRUE));
ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_TRUE));
}
EOLIAN static Eina_Bool
_efl_ui_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
{
ELM_PART_RETURN_VAL(_elm_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_FALSE));
ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_FALSE));
}
EOLIAN static Eina_Bool
_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
{
ELM_PART_RETURN_VAL(_elm_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL);
ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL);
}
EOLIAN static Eina_Bool
@ -176,25 +176,25 @@ _efl_ui_layout_internal_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_
EOLIAN static Eina_Bool
_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
{
ELM_PART_RETURN_VAL(_elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj));
ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj));
}
EOLIAN static Eina_Bool
_efl_ui_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
{
ELM_PART_RETURN_VAL(_elm_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj));
ELM_PART_RETURN_VAL(_efl_ui_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj));
}
EOLIAN static Eina_Bool
_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
{
ELM_PART_RETURN_VAL(_elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj));
ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj));
}
EOLIAN static Eina_Bool
_efl_ui_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
{
ELM_PART_RETURN_VAL(_elm_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing));
ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing));
}
EOLIAN static Eina_Bool
@ -208,7 +208,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_
other = efl_pack_content_get(pack, index + 1);
if (other)
ELM_PART_RETURN_VAL(_elm_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, other));
ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, other));
ELM_PART_CALL(efl_pack_end(obj, subobj));
ELM_PART_RETURN_VAL(EINA_TRUE);
@ -217,7 +217,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_
EOLIAN static Eina_Bool
_efl_ui_layout_internal_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, int index)
{
ELM_PART_RETURN_VAL(_elm_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index));
ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index));
}
EOLIAN static Efl_Gfx *
@ -270,7 +270,7 @@ EOLIAN static void
_efl_ui_layout_internal_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part)
{
pd->obj = layout;
pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, obj);
pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj);
eina_stringshare_replace(&pd->part, part);
pd->temp = 1;
}
@ -305,20 +305,20 @@ _efl_ui_layout_internal_table_efl_container_content_count(Eo *obj EINA_UNUSED, E
EOLIAN static Eina_Bool
_efl_ui_layout_internal_table_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
{
ELM_PART_RETURN_VAL(_elm_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_TRUE));
ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_TRUE));
}
EOLIAN static Eina_Bool
_efl_ui_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
{
ELM_PART_RETURN_VAL(_elm_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_FALSE));
ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_FALSE));
}
EOLIAN static Eina_Bool
_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj)
{
if (!subobj) ELM_PART_RETURN_VAL(EINA_FALSE);
ELM_PART_RETURN_VAL(_elm_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj);
ELM_PART_RETURN_VAL(_efl_ui_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj);
}
EOLIAN static Eina_Bool
@ -331,7 +331,7 @@ _efl_ui_layout_internal_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layou
EOLIAN static Eina_Bool
_efl_ui_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan)
{
ELM_PART_RETURN_VAL(_elm_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan));
ELM_PART_RETURN_VAL(_efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan));
}
EOLIAN static Efl_Gfx *

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

@ -555,11 +555,11 @@ _efl_ui_panes_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT();
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX);
#define EFL_UI_PANES_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_panes), \
ELM_LAYOUT_CONTENT_ALIASES_OPS()
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_panes.eo.c"

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

@ -1,4 +1,4 @@
class Efl.Ui.Panes (Elm.Layout, Efl.Orientation,
class Efl.Ui.Panes (Efl.Ui.Layout, Efl.Orientation,
Efl.Ui.Clickable)
{
[[Elementary panes class]]

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

@ -646,12 +646,12 @@ _efl_ui_progressbar_class_constructor(Efl_Class *klass)
}
/* Efl.Part begin */
ELM_PART_OVERRIDE(efl_ui_progressbar, EFL_UI_PROGRESSBAR, ELM_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(efl_ui_progressbar, EFL_UI_PROGRESSBAR, EFL_UI_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data)
static EOLIAN Eina_Bool
_efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
ELM_PART_RETURN_VAL(_efl_ui_progressbar_content_set(pd->obj, sd, pd->part, content));
}
@ -659,7 +659,7 @@ _efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Da
EOLIAN static void
_efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
_progressbar_part_value_set(pd->obj, sd, pd->part, val);
@ -668,7 +668,7 @@ _efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part
EOLIAN static double
_efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
return _progressbar_part_value_get(sd, pd->part);
@ -680,12 +680,12 @@ _efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)

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

@ -1,4 +1,4 @@
class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Range,
class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range,
Efl.Orientation)
{
[[Elementary progressbar class]]

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

@ -1,4 +1,4 @@
class Efl.Ui.Progressbar.Internal.Part (Elm.Layout.Internal.Part, Efl.Ui.Range)
class Efl.Ui.Progressbar.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Ui.Range)
{
[[Elementary progressbar internal part class]]
data: Elm_Part_Data;

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

@ -401,10 +401,10 @@ _efl_ui_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Radio
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_RADIO_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_radio), \
ELM_LAYOUT_TEXT_ALIASES_OPS()
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_radio.eo.c"

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

@ -1564,7 +1564,7 @@ _efl_ui_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UN
// A11Y Accessibility - END
/* Efl.Part begin */
ELM_PART_OVERRIDE(efl_ui_slider, EFL_UI_SLIDER, ELM_LAYOUT, Efl_Ui_Slider_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(efl_ui_slider, EFL_UI_SLIDER, EFL_UI_LAYOUT, Efl_Ui_Slider_Data, Elm_Part_Data)
static Eina_Bool
_efl_ui_slider_content_set(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
@ -1580,7 +1580,7 @@ _efl_ui_slider_content_set(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUSED, const c
static EOLIAN Eina_Bool
_efl_ui_slider_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
ELM_PART_RETURN_VAL(_efl_ui_slider_content_set(pd->obj, sd, pd->part, content));
}
@ -1621,7 +1621,7 @@ _span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, int w, int h)
EOLIAN void
_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int w, int h)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
_span_size_set(pd->obj, sd, w, h);
@ -1630,7 +1630,7 @@ _efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Da
EOLIAN void
_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int *w, int *h)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
if (_is_horizontal(sd->orientation))
@ -1782,12 +1782,12 @@ elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_SLIDER_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_slider), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider)

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

@ -1,7 +1,7 @@
type slider_func_type: __undefined_type; [[Elementary slider function type]]
type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Range,
class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range,
Efl.Orientation,
Elm.Interface.Atspi.Value,
Elm.Interface.Atspi_Widget_Action)

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

@ -1,4 +1,4 @@
class Efl.Ui.Slider.Internal.Part (Elm.Layout.Internal.Part, Efl.Gfx.Size.Hint)
class Efl.Ui.Slider.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Gfx.Size.Hint)
{
[[Elementary slider internal part class]]
data: Elm_Part_Data;

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

@ -1029,7 +1029,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
evas_event_thaw(evas_object_evas_get(obj));
evas_event_thaw_eval(evas_object_evas_get(obj));
efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
evas_object_unref(obj);
@ -5327,9 +5327,9 @@ _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED,
#if 0
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
#include "elm_entry_internal_part.eo.c"
/* Efl.Part end */
@ -5337,12 +5337,12 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_TEXT_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_text), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_text), \
ELM_LAYOUT_CONTENT_ALIASES_OPS()
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_text.eo.c"

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

@ -50,7 +50,7 @@ struct Efl.Ui.Text.Anchor_Hover_Info
]]
}
class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Ui.Text.Interactive)
{

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

@ -1,4 +1,4 @@
class Efl.Ui.Video (Elm.Layout, Efl.File,
class Efl.Ui.Video (Efl.Ui.Layout, Efl.File,
Efl.Player, Elm.Interface.Atspi_Widget_Action)
{
[[Efl UI video class]]

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

@ -1573,10 +1573,10 @@ _elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
ELM_PART_CONTENT_DEFAULT_SET(elm_ctxpopup, "default")
#include "elm_ctxpopup_internal_part.eo.c"

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

@ -3234,8 +3234,8 @@ _elm_fileselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_fileselector, ELM_FILESELECTOR, ELM_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector, ELM_FILESELECTOR, ELM_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data)
#include "elm_fileselector_internal_part.eo.c"
/* Efl.Part end */

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

@ -675,12 +675,12 @@ _elm_fileselector_entry_class_constructor(Efl_Class *klass)
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
ELM_PART_CONTENT_DEFAULT_SET(elm_fileselector_entry, "button icon")
#include "elm_fileselector_entry_internal_part.eo.c"

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

@ -2134,9 +2134,9 @@ _elm_multibuttonentry_item_elm_interface_atspi_widget_action_elm_actions_get(Eo
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, ELM_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, ELM_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, ELM_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
#include "elm_multibuttonentry_internal_part.eo.c"
/* Efl.Part end */

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

@ -2069,12 +2069,12 @@ _elm_naviframe_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UN
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
#include "elm_naviframe_internal_part.eo.c"
/* Efl.Part end */

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

@ -707,8 +707,8 @@ _elm_player_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
/* Efl.Part implementation */
ELM_PART_OVERRIDE(elm_player, ELM_PLAYER, ELM_LAYOUT, Elm_Player_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, ELM_LAYOUT, Elm_Player_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data)
ELM_PART_CONTENT_DEFAULT_SET(elm_player, "video")
#include "elm_player_internal_part.eo.c"

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

@ -1929,12 +1929,12 @@ _elm_popup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Popup_Data
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
ELM_PART_CONTENT_DEFAULT_SET(elm_popup, "default")
#include "elm_popup_internal_part.eo.c"

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

@ -659,19 +659,19 @@ _elm_actionslider_class_constructor(Efl_Class *klass)
}
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_actionslider, ELM_ACTIONSLIDER, ELM_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_actionslider, ELM_ACTIONSLIDER, ELM_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, ELM_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
#include "elm_actionslider_internal_part.eo.c"
/* Efl.Part end */
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_ACTIONSLIDER_EXTRA_OPS \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(elm_actionslider), \
EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider)

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

@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos
all = (1 << 3) - 1 [[All positions for left/center/right.]]
}
class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable)
class Elm.Actionslider (Efl.Ui.Layout, Efl.Ui.Selectable)
{
[[An actionslider is a switcher for 2 or 3 labels

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

@ -1,4 +1,4 @@
class Elm_Actionslider.Internal.Part (Elm.Layout.Internal.Part, Efl.Text)
class Elm_Actionslider.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
{
[[Elementary Actionslider internal part class]]
data: null;

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

@ -282,10 +282,10 @@ elm_bg_file_get(const Eo *obj, const char **file, const char **group)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_BG_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(elm_bg), \
EFL_CANVAS_GROUP_ADD_OPS(elm_bg)

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

@ -13,7 +13,7 @@ enum Elm.Bg.Option
last [[Sentinel value to indicate last enum field during iteration. Also used to indicate errors]]
}
class Elm.Bg (Elm.Layout, Efl.File)
class Elm.Bg (Efl.Ui.Layout, Efl.File)
{
[[The bg (background) widget is used for setting (solid) background decorations

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

@ -242,6 +242,7 @@ _elm_bubble_efl_object_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
EOLIAN static void
_elm_bubble_pos_set(Eo *obj, Elm_Bubble_Data *sd, Elm_Bubble_Pos pos)
{
/* FIXME: Why is this dealing with layout data directly? */
ELM_LAYOUT_DATA_GET(obj, ld);
if (pos < ELM_BUBBLE_POS_TOP_LEFT || pos > ELM_BUBBLE_POS_BOTTOM_RIGHT)
@ -280,20 +281,20 @@ _elm_bubble_class_constructor(Efl_Class *klass)
}
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_bubble, ELM_BUBBLE, ELM_LAYOUT, Elm_Bubble_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, ELM_LAYOUT, Elm_Bubble_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data)
#include "elm_bubble_internal_part.eo.c"
/* Efl.Part end */
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_BUBBLE_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(elm_bubble), \
EFL_CANVAS_GROUP_ADD_OPS(elm_bubble)

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

@ -12,7 +12,7 @@ enum Elm.Bubble.Pos
bottom_right [[The arrow of the bubble points to the bottom right corner.]]
}
class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable)
class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable)
{
[[Speech bubble widget used in messaging applications]]

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

@ -1,4 +1,4 @@
class Elm_Bubble.Internal.Part (Elm.Layout.Internal.Part, Efl.Text)
class Elm_Bubble.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
{
[[Elementary Bubble internal part class]]
data: null;

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

@ -72,7 +72,7 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark.
with @Elm.Calendar.mark_del.
]]
class Elm.Calendar (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
class Elm.Calendar (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
{
[[Calendar widget

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

@ -18,7 +18,7 @@ enum Elm.Clock.Edit_Mode
all = (1 << 6) - 1 [[All digits should be editable.]]
}
class Elm.Clock (Elm.Layout)
class Elm.Clock (Efl.Ui.Layout)
{
[[Digital clock widget

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

@ -5,7 +5,7 @@ import elm_general;
struct @extern Elm_Code; [[Elementary code main data structure]] /* The main interface currently defined in code */
struct @extern Elm_Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */
class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text)
class Elm.Code_Widget (Efl.Ui.Layout, Elm.Interface.Atspi.Text)
{
[[Elementary code widget]]
eo_prefix: elm_obj_code_widget;

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

@ -12,7 +12,7 @@ enum Elm.Colorselector.Mode
all [[All possible color selector is displayed.]]
}
class Elm.Colorselector (Elm.Layout, Elm.Interface.Atspi_Widget_Action,
class Elm.Colorselector (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action,
Efl.Ui.Clickable)
{
[[Elementary colorselector class]]

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

@ -1026,10 +1026,10 @@ _elm_conformant_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_CONFORMANT_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant)
#include "elm_conformant.eo.c"

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

@ -1,4 +1,4 @@
class Elm.Conformant (Elm.Layout)
class Elm.Conformant (Efl.Ui.Layout)
{
[[Elementary conformant class]]
legacy_prefix: elm_conformant;

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

@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction
unknown [[Ctxpopup does not determine it's direction yet.]]
}
class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action,
class Elm.Ctxpopup (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action,
Efl.Orientation, Efl.Ui.Menu)
{
[[Elementary context popup class]]

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

@ -1,4 +1,4 @@
class Elm.Ctxpopup.Internal.Part (Elm.Layout.Internal.Part)
class Elm.Ctxpopup.Internal.Part (Efl.Ui.Layout.Internal.Part)
{
[[Elementary contex popup internal part class]]
data: null;

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

@ -609,9 +609,9 @@ _elm_dayselector_class_constructor(Efl_Class *klass)
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_dayselector, ELM_DAYSELECTOR, ELM_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_dayselector, ELM_DAYSELECTOR, ELM_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_dayselector, ELM_DAYSELECTOR, ELM_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
#include "elm_dayselector_internal_part.eo.c"
/* Efl.Part end */

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

@ -17,7 +17,7 @@ enum Elm.Dayselector.Day
max [[Sentinel value to indicate last enum field during iteration]]
}
class Elm.Dayselector (Elm.Layout)
class Elm.Dayselector (Efl.Ui.Layout)
{
[[Elementary dayselector class]]
legacy_prefix: elm_dayselector;

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

@ -1,4 +1,4 @@
class Elm.Dayselector.Internal.Part (Elm.Layout.Internal.Part)
class Elm.Dayselector.Internal.Part (Efl.Ui.Layout.Internal.Part)
{
[[Elementary dayselector internal part class]]
data: null;

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

@ -999,7 +999,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
evas_event_thaw(evas_object_evas_get(obj));
evas_event_thaw_eval(evas_object_evas_get(obj));
efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
evas_object_unref(obj);
@ -6060,11 +6060,11 @@ _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd)
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
#include "elm_entry_internal_part.eo.c"
@ -6072,14 +6072,14 @@ ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_ENTRY_EXTRA_OPS \
ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(elm_entry)
#include "elm_entry.eo.c"

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

@ -115,7 +115,7 @@ enum Elm.Cnp_Mode
plaintext, [[ copy & paste text without markup tag ]]
}
class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
Efl.Ui.Selectable, Efl.Ui.Scrollable)
{

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

@ -1,4 +1,4 @@
class Elm.Entry.Internal.Part (Elm.Layout.Internal.Part, Efl.Text)
class Elm.Entry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
{
[[Elementary entry internal part class]]
data: null;

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

@ -1,4 +1,4 @@
class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector,
Elm.Interface.Atspi_Widget_Action,
Efl.Ui.Clickable, Efl.Ui.Selectable)
{

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

@ -1,4 +1,4 @@
class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector,
Efl.Ui.Clickable, Efl.Ui.Selectable)
{
[[Elementary fileselector entry class]]

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

@ -1,4 +1,4 @@
class Elm.Fileselector.Entry.Internal.Part (Elm.Layout.Internal.Part, Efl.Text)
class Elm.Fileselector.Entry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
{
[[Elementary fileselector entry internal part class]]
data: null;

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

@ -1,4 +1,4 @@
class Elm.Fileselector.Internal.Part (Elm.Layout.Internal.Part, Efl.Text)
class Elm.Fileselector.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
{
[[Elementary fileselector entry internal part class]]
data: null;

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

@ -1,4 +1,4 @@
class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Spin,
Elm.Interface.Atspi_Widget_Action,
Efl.Ui.Selectable)
{

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

@ -10,7 +10,7 @@ enum Elm.Gengrid.Reorder_Type
swap [[Swap reorder type]]
}
class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
class Elm.Gengrid (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action,
Elm.Interface.Atspi.Selection)
{

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

@ -439,7 +439,7 @@ _item_content_realize(Elm_Gen_Item *it,
ELM_WIDGET_DATA_GET_OR_RETURN(content, wd);
// FIXME : Layout need sizing eval before group calculate
if (efl_class_get(content) == ELM_LAYOUT_CLASS)
if (efl_class_get(content) == EFL_UI_LAYOUT_CLASS)
elm_layout_sizing_eval(content);
_widget_calculate_recursive(content);

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

@ -2,7 +2,7 @@ import elm_general;
import elm_list;
import elm_genlist_item;
class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
Efl.Ui.Selectable)
{

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

@ -892,18 +892,18 @@ _elm_hover_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
#include "elm_hover_internal_part.eo.c"
/* Efl.Part end */
/* Internal EO APIs and hidden overrides */
// ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() is overridden with an if()
// ELM_LAYOUT_CONTENT_ALIASES_OPS() somehow doesn't compile!?
// ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) is overridden with an if()
// ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX) somehow doesn't compile!?
#define ELM_HOVER_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover), \

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

@ -7,7 +7,7 @@ enum Elm.Hover.Axis
both [[ELM_HOVER_AXIS_BOTH -- both.]]
}
class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action, Efl.Ui.Focus.Manager)
class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action, Efl.Ui.Focus.Manager)
{
[[Elementary hover class]]
legacy_prefix: elm_hover;

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

@ -1,4 +1,4 @@
class Elm.Hover.Internal.Part (Elm.Layout.Internal.Part)
class Elm.Hover.Internal.Part (Efl.Ui.Layout.Internal.Part)
{
[[elementary hover internal part class]]
data: null;

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

@ -1,4 +1,4 @@
class Elm.Index (Elm.Layout, Efl.Orientation,
class Elm.Index (Efl.Ui.Layout, Efl.Orientation,
Efl.Ui.Clickable, Efl.Ui.Selectable)
{
[[elementary index class]]

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

@ -218,11 +218,11 @@ _elm_inwin_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_INWIN_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(elm_inwin), \
ELM_LAYOUT_SIZING_EVAL_OPS(elm_inwin), \
ELM_LAYOUT_CONTENT_ALIASES_OPS()
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
#include "elm_inwin.eo.c"

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

@ -1,4 +1,4 @@
class Elm.Inwin (Elm.Layout, Efl.Ui.Focus.Manager)
class Elm.Inwin (Efl.Ui.Layout, Efl.Ui.Focus.Manager)
{
[[Elementary inwin class]]
legacy_prefix: elm_inwin;

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

@ -634,8 +634,8 @@ _elm_label_class_constructor(Efl_Class *klass)
}
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_label, ELM_LABEL, ELM_LAYOUT, Elm_Label_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_label, ELM_LABEL, ELM_LAYOUT, Elm_Label_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data)
#include "elm_label_internal_part.eo.c"
/* Efl.Part end */

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

@ -8,7 +8,7 @@ enum Elm.Label.Slide_Mode
always [[Slide always.]]
}
class Elm.Label (Elm.Layout)
class Elm.Label (Efl.Ui.Layout)
{
[[Elementary label class]]
legacy_prefix: elm_label;

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

@ -1,4 +1,4 @@
class Elm_Label.Internal.Part (Elm.Layout.Internal.Part, Efl.Text)
class Elm_Label.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
{
[[Elementary button internal part class]]
data: null;

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

@ -168,7 +168,7 @@
#include <elm_layout_common.h>
#ifdef EFL_EO_API_SUPPORT
#include <elm_layout_eo.h>
#include <efl_ui_layout.eo.h>
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include <elm_layout_legacy.h>

11
src/lib/elementary/elm_layout_eo.h
View File

@ -1,11 +0,0 @@
/**
* @ingroup Elm_Layout
*
* @{
*/
#include "elm_layout.eo.h"
/**
* @}
*/

8
src/lib/elementary/elm_layout_legacy.h
View File

@ -18,9 +18,9 @@ struct _Elm_Layout_Part_Alias_Description
const char *alias; /**< Alternate name for a given (real) part. Calls
* receiving this string as a part name will be translated
* to the string at
* Elm.Layout_Part_Proxies_Description::real_part */
* Efl.Ui.Layout_Part_Proxies_Description::real_part */
const char *real_part; /**< Target part name for the alias set on
* Elm.Layout_Part_Proxies_Description::real_part. An
* Efl.Ui.Layout_Part_Proxies_Description::real_part. An
* example of usage would be "default" on that field,
* with "elm.content.swallow" on this one */
};
@ -92,7 +92,7 @@ EAPI void elm_layout_sizing_eval(Evas_Object *obj);
*
* @ingroup Elm_Layout
*/
EAPI void elm_layout_sizing_restricted_eval(Elm_Layout *obj, Eina_Bool width, Eina_Bool height);
EAPI void elm_layout_sizing_restricted_eval(Evas_Object *obj, Eina_Bool width, Eina_Bool height);
/**
* @brief Add a callback for a (Edje) signal emitted by a layout widget's
@ -693,4 +693,4 @@ EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const
*/
EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
#include "elm_layout.eo.legacy.h"
#include "efl_ui_layout.eo.legacy.h"

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

@ -36,7 +36,7 @@ enum Elm.List.Mode
last [[Indicates error if returned by elm_list_mode_get().]]
}
class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
Efl.Ui.Clickable, Efl.Ui.Selectable)
{

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

@ -1,7 +1,7 @@
type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]]
type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]]
class Elm.Multibuttonentry (Elm.Layout)
class Elm.Multibuttonentry (Efl.Ui.Layout)
{
[[Elementary multibuttonentry class]]
legacy_prefix: elm_multibuttonentry;

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

@ -1,4 +1,4 @@
class Elm.Multibuttonentry.Internal.Part (Elm.Layout.Internal.Part, Efl.Text)
class Elm.Multibuttonentry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
{
[[Elementary multibuttonentry internal part class]]
data: null;

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

@ -1,4 +1,4 @@
class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
class Elm.Naviframe (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
{
[[Elementary naviframe class]]
legacy_prefix: elm_naviframe;

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

@ -1,4 +1,4 @@
class Elm.Naviframe.Internal.Part (Elm.Layout.Internal.Part)
class Elm.Naviframe.Internal.Part (Efl.Ui.Layout.Internal.Part)
{
[[Elementary naviframe internal part class]]
data: null;

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

@ -8,7 +8,7 @@ enum Elm.Panel.Orient
right [[Panel (dis)appears from the right]]
}
class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
class Elm.Panel (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action)
{
[[Elementary panel class]]

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

@ -1,7 +1,7 @@
#ifndef _ELM_PART_HELPER_H
#define _ELM_PART_HELPER_H
#include "elm_layout_internal_part.eo.h"
#include "efl_ui_layout_internal_part.eo.h"
//#define ELM_PART_HOOK do { ERR("%p:%s [%d]", pd->obj, pd->part, (int) pd->temp); } while(0)
#define ELM_PART_HOOK do {} while(0)
@ -104,7 +104,7 @@ _ ## type ## _internal_part_efl_text_text_get(Eo *obj, partdata *pd) \
#define ELM_PART_TEXT_DEFAULT_OPS(type) \
EFL_OBJECT_OP_FUNC(elm_widget_default_text_part_get, _ ## type ## _default_text_part_get)
// For widgets that inherit from something with parts (eg. from Elm.Layout)
// For widgets that inherit from something with parts (eg. from Efl.Ui.Layout)
#define ELM_PART_OVERRIDE(type, TYPE, SUPER, typedata, partdata) \
static EOLIAN Efl_Object * \
_ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const char *part) \

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

@ -1,4 +1,4 @@
class Elm.Player (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
class Elm.Player (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
{
[[Elementary player class]]
legacy_prefix: elm_player;

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

@ -1,4 +1,4 @@
class Elm.Player.Internal.Part (Elm.Layout.Internal.Part)
class Elm.Player.Internal.Part (Efl.Ui.Layout.Internal.Part)
{
[[Elementary player internal part class]]
data: null;

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

@ -23,7 +23,7 @@ enum Elm.Popup.Orient
}
class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
class Elm.Popup (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
{
[[Elementary popup class]]
legacy_prefix: elm_popup;

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

@ -1,4 +1,4 @@
class Elm.Popup.Internal.Part (Elm.Layout.Internal.Part, Efl.Text)
class Elm.Popup.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
{
[[Elementary popup internal part class]]
data: null;

8
src/lib/elementary/elm_priv.h
View File

@ -632,11 +632,11 @@ const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo *o
#define _ELM_LAYOUT_ALIASES_OPS(_pfx, _typ) \
EFL_OBJECT_OP_FUNC(elm_layout_##_typ##_aliases_get, _##_pfx##_##_typ##_aliases_get)
#define ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() _ELM_LAYOUT_ALIASES_IMPLEMENT(MY_CLASS_PFX, content)
#define ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() _ELM_LAYOUT_ALIASES_IMPLEMENT(MY_CLASS_PFX, text)
#define ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(_pfx) _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, content)
#define ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(_pfx) _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, text)
#define ELM_LAYOUT_CONTENT_ALIASES_OPS() _ELM_LAYOUT_ALIASES_OPS(MY_CLASS_PFX, content)
#define ELM_LAYOUT_TEXT_ALIASES_OPS() _ELM_LAYOUT_ALIASES_OPS(MY_CLASS_PFX, text)
#define ELM_LAYOUT_CONTENT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx, content)
#define ELM_LAYOUT_TEXT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx, text)
#define ELM_LAYOUT_SIZING_EVAL_OPS(_pfx) \
EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _##_pfx##_elm_layout_sizing_eval)

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

@ -1476,10 +1476,10 @@ _elm_scroller_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
ELM_PART_OVERRIDE(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
// FIXME: should be "content" but "default" was legacy API
ELM_PART_CONTENT_DEFAULT_SET(elm_scroller, "default")
#include "elm_scroller_internal_part.eo.c"

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

@ -1,4 +1,4 @@
class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action,
Efl.Ui.Scrollable, Efl.Container)
{

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

@ -1,4 +1,4 @@
class Elm.Scroller.Internal.Part (Elm.Layout.Internal.Part)
class Elm.Scroller.Internal.Part (Efl.Ui.Layout.Internal.Part)
{
[[Elementary scroller internal part class]]
data: null;

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

@ -1,4 +1,4 @@
class Elm.Segment_Control (Elm.Layout)
class Elm.Segment_Control (Efl.Ui.Layout)
{
[[Elementary segment control class]]
legacy_prefix: elm_segment_control;

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

@ -1,4 +1,4 @@
class Elm.Separator (Elm.Layout, Efl.Orientation)
class Elm.Separator (Efl.Ui.Layout, Efl.Orientation)
{
[[Elementary separator class]]
legacy_prefix: elm_separator;

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

@ -1,6 +1,6 @@
type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]]
class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
class Elm.Slideshow (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
{
[[Elementary slideshow class]]
eo_prefix: elm_obj_slideshow;

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

@ -1,4 +1,4 @@
class Elm.Spinner (Elm.Layout, Efl.Ui.Spin,
class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin,
Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action)
{
[[Elementary spinner class]]

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

@ -1,4 +1,4 @@
class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable,
class Elm.Thumb (Efl.Ui.Layout, Efl.File, Efl.Ui.Clickable,
Efl.Ui.Draggable)
{
[[Elementary thumbnail class]]

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