Efl: Introduce Efl.Container and unify APIs
This removes Efl.Pack_Named which had a terrible name, removes Elm.Container which should have been renamed Efl.Ui.Container anyway, and introduces an interface Efl.Container instead. The hierarchy tree is now changed as objects don't inherit from Efl.Container (it's an interface, not a regular class) but only implement it. Obviously it is very easy to reintroduce an Efl.Ui.Container parent class if we need it, but I guess it should have some actual logic. It's basically part of what Elm.Widget already does. Some function names have been modified to look better in C with the efl_content prefix. @feature
This commit is contained in:
parent
8c02bf5be6
commit
902950018b
|
@ -25,11 +25,11 @@ efl_eolian_files = \
|
||||||
lib/efl/interfaces/efl_animator.eo \
|
lib/efl/interfaces/efl_animator.eo \
|
||||||
lib/efl/interfaces/efl_orientation.eo \
|
lib/efl/interfaces/efl_orientation.eo \
|
||||||
lib/efl/interfaces/efl_flipable.eo \
|
lib/efl/interfaces/efl_flipable.eo \
|
||||||
|
lib/efl/interfaces/efl_container.eo \
|
||||||
lib/efl/interfaces/efl_pack.eo \
|
lib/efl/interfaces/efl_pack.eo \
|
||||||
lib/efl/interfaces/efl_pack_layout.eo \
|
lib/efl/interfaces/efl_pack_layout.eo \
|
||||||
lib/efl/interfaces/efl_pack_linear.eo \
|
lib/efl/interfaces/efl_pack_linear.eo \
|
||||||
lib/efl/interfaces/efl_pack_grid.eo \
|
lib/efl/interfaces/efl_pack_grid.eo \
|
||||||
lib/efl/interfaces/efl_pack_named.eo \
|
|
||||||
lib/efl/interfaces/efl_vpath.eo \
|
lib/efl/interfaces/efl_vpath.eo \
|
||||||
lib/efl/interfaces/efl_vpath_manager.eo \
|
lib/efl/interfaces/efl_vpath_manager.eo \
|
||||||
lib/efl/interfaces/efl_vpath_file.eo \
|
lib/efl/interfaces/efl_vpath_file.eo \
|
||||||
|
|
|
@ -19,7 +19,6 @@ elm_public_eolian_files = \
|
||||||
lib/elementary/elm_colorselector.eo \
|
lib/elementary/elm_colorselector.eo \
|
||||||
lib/elementary/elm_combobox.eo \
|
lib/elementary/elm_combobox.eo \
|
||||||
lib/elementary/elm_conformant.eo \
|
lib/elementary/elm_conformant.eo \
|
||||||
lib/elementary/elm_container.eo \
|
|
||||||
lib/elementary/elm_ctxpopup.eo \
|
lib/elementary/elm_ctxpopup.eo \
|
||||||
lib/elementary/elm_datetime.eo \
|
lib/elementary/elm_datetime.eo \
|
||||||
lib/elementary/elm_dayselector.eo \
|
lib/elementary/elm_dayselector.eo \
|
||||||
|
@ -182,7 +181,6 @@ includesunstable_HEADERS = \
|
||||||
lib/elementary/elm_widget_clock.h \
|
lib/elementary/elm_widget_clock.h \
|
||||||
lib/elementary/elm_widget_colorselector.h \
|
lib/elementary/elm_widget_colorselector.h \
|
||||||
lib/elementary/elm_widget_conform.h \
|
lib/elementary/elm_widget_conform.h \
|
||||||
lib/elementary/elm_widget_container.h \
|
|
||||||
lib/elementary/elm_widget_combobox.h \
|
lib/elementary/elm_widget_combobox.h \
|
||||||
lib/elementary/elm_widget_ctxpopup.h \
|
lib/elementary/elm_widget_ctxpopup.h \
|
||||||
lib/elementary/elm_widget_datetime.h \
|
lib/elementary/elm_widget_datetime.h \
|
||||||
|
@ -323,7 +321,6 @@ includesub_HEADERS = \
|
||||||
lib/elementary/elm_conform.h \
|
lib/elementary/elm_conform.h \
|
||||||
lib/elementary/elm_conform_eo.h \
|
lib/elementary/elm_conform_eo.h \
|
||||||
lib/elementary/elm_conform_legacy.h \
|
lib/elementary/elm_conform_legacy.h \
|
||||||
lib/elementary/elm_container.h \
|
|
||||||
lib/elementary/elm_cursor.h \
|
lib/elementary/elm_cursor.h \
|
||||||
lib/elementary/elm_datetime.h \
|
lib/elementary/elm_datetime.h \
|
||||||
lib/elementary/elm_datetime_common.h \
|
lib/elementary/elm_datetime_common.h \
|
||||||
|
@ -552,7 +549,6 @@ lib_elementary_libelementary_la_SOURCES = \
|
||||||
lib/elementary/elc_combobox.c \
|
lib/elementary/elc_combobox.c \
|
||||||
lib/elementary/elm_config.c \
|
lib/elementary/elm_config.c \
|
||||||
lib/elementary/elm_conform.c \
|
lib/elementary/elm_conform.c \
|
||||||
lib/elementary/elm_container.c \
|
|
||||||
lib/elementary/elm_datetime.c \
|
lib/elementary/elm_datetime.c \
|
||||||
lib/elementary/elm_dayselector.c \
|
lib/elementary/elm_dayselector.c \
|
||||||
lib/elementary/elm_dbus_menu.c \
|
lib/elementary/elm_dbus_menu.c \
|
||||||
|
|
|
@ -162,8 +162,8 @@ static void
|
||||||
_custom_engine_layout_do(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED,
|
_custom_engine_layout_do(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED,
|
||||||
Efl_Pack *pack, const void *data EINA_UNUSED)
|
Efl_Pack *pack, const void *data EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Eina_Iterator *it = efl_pack_contents_get(pack);
|
Eina_Iterator *it = efl_content_iterate(pack);
|
||||||
int count = efl_pack_contents_count(pack), i = 0;
|
int count = efl_content_count(pack), i = 0;
|
||||||
int px, py, pw, ph;
|
int px, py, pw, ph;
|
||||||
Eo *sobj;
|
Eo *sobj;
|
||||||
|
|
||||||
|
|
|
@ -121,7 +121,7 @@ layout_updated_cb(void *data, const Eo_Event *event)
|
||||||
int rows, cols, count;
|
int rows, cols, count;
|
||||||
|
|
||||||
efl_pack_grid_size_get(event->obj, &cols, &rows);
|
efl_pack_grid_size_get(event->obj, &cols, &rows);
|
||||||
count = efl_pack_contents_count(event->obj);
|
count = efl_content_count(event->obj);
|
||||||
sprintf(buf, "%d items (%dx%d)", count, cols, rows);
|
sprintf(buf, "%d items (%dx%d)", count, cols, rows);
|
||||||
elm_object_text_set(o, buf);
|
elm_object_text_set(o, buf);
|
||||||
|
|
||||||
|
@ -137,7 +137,7 @@ child_evt_cb(void *data, const Eo_Event *event)
|
||||||
char buf[64];
|
char buf[64];
|
||||||
|
|
||||||
efl_pack_grid_content_position_get(event->obj, it, &col, &row, &colspan, &rowspan);
|
efl_pack_grid_content_position_get(event->obj, it, &col, &row, &colspan, &rowspan);
|
||||||
if (event->desc == EFL_PACK_EVENT_CONTENT_ADDED)
|
if (event->desc == EFL_CONTAINER_EVENT_CONTENT_ADDED)
|
||||||
sprintf(buf, "pack %d,%d %dx%d", col, row, colspan, rowspan);
|
sprintf(buf, "pack %d,%d %dx%d", col, row, colspan, rowspan);
|
||||||
else
|
else
|
||||||
sprintf(buf, "unpack %d,%d %dx%d", col, row, colspan, rowspan);
|
sprintf(buf, "unpack %d,%d %dx%d", col, row, colspan, rowspan);
|
||||||
|
@ -166,7 +166,7 @@ _custom_engine_layout_do(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED,
|
||||||
efl_pack_grid_size_get(pack, &cols, &rows);
|
efl_pack_grid_size_get(pack, &cols, &rows);
|
||||||
if (!cols || !rows) goto end;
|
if (!cols || !rows) goto end;
|
||||||
|
|
||||||
it = efl_pack_contents_get(pack);
|
it = efl_content_iterate(pack);
|
||||||
EINA_ITERATOR_FOREACH(it, item)
|
EINA_ITERATOR_FOREACH(it, item)
|
||||||
{
|
{
|
||||||
if (efl_pack_grid_content_position_get(pack, item, &c, &r, &cs, &rs))
|
if (efl_pack_grid_content_position_get(pack, item, &c, &r, &cs, &rs))
|
||||||
|
@ -416,8 +416,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
|
||||||
efl_gfx_visible_set(o, 1);
|
efl_gfx_visible_set(o, 1);
|
||||||
|
|
||||||
o = elm_label_add(win);
|
o = elm_label_add(win);
|
||||||
eo_event_callback_add(grid, EFL_PACK_EVENT_CONTENT_ADDED, child_evt_cb, o);
|
eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
|
||||||
eo_event_callback_add(grid, EFL_PACK_EVENT_CONTENT_REMOVED, child_evt_cb, o);
|
eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o);
|
||||||
evas_object_size_hint_align_set(o, 0.5, 0);
|
evas_object_size_hint_align_set(o, 0.5, 0);
|
||||||
evas_object_size_hint_weight_set(o, 1, 1);
|
evas_object_size_hint_weight_set(o, 1, 1);
|
||||||
efl_pack(bx, o);
|
efl_pack(bx, o);
|
||||||
|
@ -598,8 +598,8 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
||||||
efl_gfx_visible_set(o, 1);
|
efl_gfx_visible_set(o, 1);
|
||||||
|
|
||||||
o = elm_label_add(win);
|
o = elm_label_add(win);
|
||||||
eo_event_callback_add(grid, EFL_PACK_EVENT_CONTENT_ADDED, child_evt_cb, o);
|
eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
|
||||||
eo_event_callback_add(grid, EFL_PACK_EVENT_CONTENT_REMOVED, child_evt_cb, o);
|
eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o);
|
||||||
evas_object_size_hint_align_set(o, 0.5, 0);
|
evas_object_size_hint_align_set(o, 0.5, 0);
|
||||||
evas_object_size_hint_weight_set(o, 1, 1);
|
evas_object_size_hint_weight_set(o, 1, 1);
|
||||||
efl_pack(bx, o);
|
efl_pack(bx, o);
|
||||||
|
|
|
@ -117,11 +117,11 @@ static inline void efl_gfx_color16_type_set(Efl_Gfx_Color *color,
|
||||||
#include "interfaces/efl_gfx.x"
|
#include "interfaces/efl_gfx.x"
|
||||||
|
|
||||||
/* Packing & containers */
|
/* Packing & containers */
|
||||||
|
#include "interfaces/efl_container.eo.h"
|
||||||
#include "interfaces/efl_pack.eo.h"
|
#include "interfaces/efl_pack.eo.h"
|
||||||
#include "interfaces/efl_pack_layout.eo.h"
|
#include "interfaces/efl_pack_layout.eo.h"
|
||||||
#include "interfaces/efl_pack_linear.eo.h"
|
#include "interfaces/efl_pack_linear.eo.h"
|
||||||
#include "interfaces/efl_pack_grid.eo.h"
|
#include "interfaces/efl_pack_grid.eo.h"
|
||||||
#include "interfaces/efl_pack_named.eo.h"
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
interface Efl.Container (Efl.Gfx.Base)
|
||||||
|
{
|
||||||
|
[[API common to all UI container objects.]]
|
||||||
|
legacy_prefix: null;
|
||||||
|
eo_prefix: efl_content;
|
||||||
|
methods {
|
||||||
|
@property content {
|
||||||
|
[[Swallowed sub-object contained in this object.]]
|
||||||
|
set {
|
||||||
|
return: bool;
|
||||||
|
}
|
||||||
|
get {}
|
||||||
|
keys {
|
||||||
|
part: const(char)*; [[the part in which to swallow the object]]
|
||||||
|
}
|
||||||
|
values {
|
||||||
|
content: Efl.Gfx.Base*; [[the object to swallow.]]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@property content_part_name {
|
||||||
|
[[The name of the part under which an object is swallowed.]]
|
||||||
|
get {}
|
||||||
|
keys {
|
||||||
|
content: Efl.Gfx.Base*;
|
||||||
|
}
|
||||||
|
values {
|
||||||
|
name: const(char)*;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
content_unset {
|
||||||
|
[[Unswallow the object in the given part of the container and return it.]]
|
||||||
|
params {
|
||||||
|
@in name: const(char)* @nullable;
|
||||||
|
}
|
||||||
|
return: Efl.Gfx.Base*;
|
||||||
|
}
|
||||||
|
content_iterate {
|
||||||
|
[[Begin iterating over this object's contents.]]
|
||||||
|
return: free(own(iterator<Efl.Gfx.Base *> *), eina_iterator_free) @warn_unused;
|
||||||
|
}
|
||||||
|
content_count {
|
||||||
|
[[Returns the number of UI elements packed in this container.]]
|
||||||
|
return: int;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
events {
|
||||||
|
content,added: Efl.Gfx.Base*; [[Sent after a new item was added.]]
|
||||||
|
content,removed: Efl.Gfx.Base*; [[Sent after an item was removed, before unref.]]
|
||||||
|
}
|
||||||
|
}
|
|
@ -33,11 +33,11 @@ EAPI const Eo_Event_Description _EFL_GFX_CHANGED =
|
||||||
EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED =
|
EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED =
|
||||||
EO_EVENT_DESCRIPTION("Graphics path changed");
|
EO_EVENT_DESCRIPTION("Graphics path changed");
|
||||||
|
|
||||||
|
#include "interfaces/efl_container.eo.c"
|
||||||
#include "interfaces/efl_pack.eo.c"
|
#include "interfaces/efl_pack.eo.c"
|
||||||
#include "interfaces/efl_pack_layout.eo.c"
|
#include "interfaces/efl_pack_layout.eo.c"
|
||||||
#include "interfaces/efl_pack_linear.eo.c"
|
#include "interfaces/efl_pack_linear.eo.c"
|
||||||
#include "interfaces/efl_pack_grid.eo.c"
|
#include "interfaces/efl_pack_grid.eo.c"
|
||||||
#include "interfaces/efl_pack_named.eo.c"
|
|
||||||
|
|
||||||
#include "interfaces/efl_model_base.eo.c"
|
#include "interfaces/efl_model_base.eo.c"
|
||||||
#include "interfaces/efl_animator.eo.c"
|
#include "interfaces/efl_animator.eo.c"
|
||||||
|
|
|
@ -1,19 +1,11 @@
|
||||||
import eina_types;
|
import eina_types;
|
||||||
|
|
||||||
interface Efl.Pack (Efl.Gfx.Base)
|
interface Efl.Pack (Efl.Container)
|
||||||
{
|
{
|
||||||
[[API common to all UI container objects.]]
|
[[API common to all UI container objects.]]
|
||||||
legacy_prefix: null;
|
legacy_prefix: null;
|
||||||
methods
|
methods
|
||||||
{
|
{
|
||||||
contents_get {
|
|
||||||
[[Begin iterating over this object's contents.]]
|
|
||||||
return: free(own(iterator<Efl.Gfx.Base *> *), eina_iterator_free) @warn_unused;
|
|
||||||
}
|
|
||||||
contents_count {
|
|
||||||
[[Returns the number of UI elements packed in this container.]]
|
|
||||||
return: int;
|
|
||||||
}
|
|
||||||
pack_clear {
|
pack_clear {
|
||||||
[[Removes all packed contents, and unreferences them.]]
|
[[Removes all packed contents, and unreferences them.]]
|
||||||
}
|
}
|
||||||
|
@ -65,8 +57,6 @@ interface Efl.Pack (Efl.Gfx.Base)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
content,added: Efl.Gfx.Base*; [[Sent after a new item was added.]]
|
|
||||||
content,removed: Efl.Gfx.Base*; [[Sent after an item was removed, before unref.]]
|
|
||||||
layout,updated; [[Sent after the layout was updated.]]
|
layout,updated; [[Sent after the layout was updated.]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
|
||||||
rowspan: int @optional; [[0 means 1, -1 means @.grid_rows]]
|
rowspan: int @optional; [[0 means 1, -1 means @.grid_rows]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
grid_contents_at {
|
grid_content_iterate {
|
||||||
[[Returns all objects at a given position in this grid.]]
|
[[Returns all objects at a given position in this grid.]]
|
||||||
return: free(own(iterator<Efl.Gfx.Base *> *), eina_iterator_free);
|
return: free(own(iterator<Efl.Gfx.Base *> *), eina_iterator_free);
|
||||||
params {
|
params {
|
||||||
|
@ -25,7 +25,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
grid_content_at {
|
grid_content_at {
|
||||||
[[Returns the first child at position, see @.grid_contents_at.]]
|
[[Returns the first child at position, see @.grid_content_iterate.]]
|
||||||
return: Efl.Gfx.Base*;
|
return: Efl.Gfx.Base*;
|
||||||
params {
|
params {
|
||||||
@in col: int;
|
@in col: int;
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
interface Efl.Pack_Named (Efl.Pack)
|
|
||||||
{
|
|
||||||
[[Common API for containers of named parts.]]
|
|
||||||
legacy_prefix: null;
|
|
||||||
eo_prefix: efl_pack;
|
|
||||||
methods {
|
|
||||||
pack_as /* @part */ {
|
|
||||||
[[Insert element in a named spot (swallow, part).]]
|
|
||||||
params {
|
|
||||||
part: const(char) *;
|
|
||||||
subobj: Efl.Gfx.Base *;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -205,7 +205,6 @@ EAPI extern Elm_Version *elm_version;
|
||||||
#include <elm_colorselector.h>
|
#include <elm_colorselector.h>
|
||||||
#include <elm_color_class.h>
|
#include <elm_color_class.h>
|
||||||
#include <elm_conform.h>
|
#include <elm_conform.h>
|
||||||
#include <elm_container.h>
|
|
||||||
#include <elm_cursor.h>
|
#include <elm_cursor.h>
|
||||||
#include <elm_datetime.h>
|
#include <elm_datetime.h>
|
||||||
#include <elm_debug.h>
|
#include <elm_debug.h>
|
||||||
|
|
|
@ -29,7 +29,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
|
||||||
Evas_Object *box = data;
|
Evas_Object *box = data;
|
||||||
Evas_Object_Box_Option *opt = event->info;
|
Evas_Object_Box_Option *opt = event->info;
|
||||||
|
|
||||||
eo_event_callback_call(box, EFL_PACK_EVENT_CONTENT_ADDED, opt->obj);
|
eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ _child_removed_cb_proxy(void *data, const Eo_Event *event)
|
||||||
Evas_Object *box = data;
|
Evas_Object *box = data;
|
||||||
Evas_Object *child = event->info;
|
Evas_Object *child = event->info;
|
||||||
|
|
||||||
eo_event_callback_call(box, EFL_PACK_EVENT_CONTENT_REMOVED, child);
|
eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -273,7 +273,7 @@ _efl_ui_box_eo_base_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
|
||||||
/* CLEAN API BELOW */
|
/* CLEAN API BELOW */
|
||||||
|
|
||||||
EOLIAN static int
|
EOLIAN static int
|
||||||
_efl_ui_box_efl_pack_contents_count(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED)
|
_efl_ui_box_efl_container_content_count(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Evas_Object_Box_Data *bd;
|
Evas_Object_Box_Data *bd;
|
||||||
|
|
||||||
|
@ -537,7 +537,7 @@ _box_item_iterator_free(Box_Item_Iterator *it)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Iterator *
|
EOLIAN static Eina_Iterator *
|
||||||
_efl_ui_box_efl_pack_contents_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED)
|
_efl_ui_box_efl_container_content_iterate(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Box_Item_Iterator *it;
|
Box_Item_Iterator *it;
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack_Linear, Efl.Pack_Layout)
|
||||||
Elm.Widget.focus_next;
|
Elm.Widget.focus_next;
|
||||||
|
|
||||||
// Packing interfaces
|
// Packing interfaces
|
||||||
Efl.Pack.contents_get;
|
Efl.Container.content_iterate;
|
||||||
Efl.Pack.contents_count;
|
Efl.Container.content_count;
|
||||||
Efl.Pack.pack_clear;
|
Efl.Pack.pack_clear;
|
||||||
Efl.Pack.unpack_all;
|
Efl.Pack.unpack_all;
|
||||||
Efl.Pack.unpack;
|
Efl.Pack.unpack;
|
||||||
|
|
|
@ -464,7 +464,7 @@ _pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj,
|
||||||
|
|
||||||
eo_key_data_set(subobj, GRID_ITEM_KEY, gi);
|
eo_key_data_set(subobj, GRID_ITEM_KEY, gi);
|
||||||
elm_widget_sub_object_add(obj, subobj);
|
elm_widget_sub_object_add(obj, subobj);
|
||||||
eo_event_callback_call(obj, EFL_PACK_EVENT_CONTENT_ADDED, subobj);
|
eo_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_ADDED, subobj);
|
||||||
eo_event_callback_array_add(subobj, subobj_callbacks(), obj);
|
eo_event_callback_array_add(subobj, subobj_callbacks(), obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -584,7 +584,7 @@ _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj)
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
eo_event_callback_call(obj, EFL_PACK_EVENT_CONTENT_REMOVED, subobj);
|
eo_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_REMOVED, subobj);
|
||||||
pd->items = (Grid_Item *)
|
pd->items = (Grid_Item *)
|
||||||
eina_inlist_remove(EINA_INLIST_GET(pd->items), EINA_INLIST_GET(gi));
|
eina_inlist_remove(EINA_INLIST_GET(pd->items), EINA_INLIST_GET(gi));
|
||||||
pd->count--;
|
pd->count--;
|
||||||
|
@ -679,7 +679,7 @@ _grid_item_iterator_create(Eo *obj, Eina_List *list)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Iterator *
|
EOLIAN static Eina_Iterator *
|
||||||
_efl_ui_grid_efl_pack_contents_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
|
_efl_ui_grid_efl_container_content_iterate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Eina_List *list;
|
Eina_List *list;
|
||||||
|
|
||||||
|
@ -690,13 +690,13 @@ _efl_ui_grid_efl_pack_contents_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static int
|
EOLIAN static int
|
||||||
_efl_ui_grid_efl_pack_contents_count(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd)
|
_efl_ui_grid_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd)
|
||||||
{
|
{
|
||||||
return pd->count;
|
return pd->count;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Iterator *
|
EOLIAN static Eina_Iterator *
|
||||||
_efl_ui_grid_efl_pack_grid_grid_contents_at(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED,
|
_efl_ui_grid_efl_pack_grid_grid_content_iterate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED,
|
||||||
int col, int row, Eina_Bool below)
|
int col, int row, Eina_Bool below)
|
||||||
{
|
{
|
||||||
Eina_List *list, *atlist = NULL;
|
Eina_List *list, *atlist = NULL;
|
||||||
|
|
|
@ -17,8 +17,8 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack_Grid, Efl.Pack_Layout)
|
||||||
Elm.Widget.theme_apply;
|
Elm.Widget.theme_apply;
|
||||||
|
|
||||||
// Packing interface
|
// Packing interface
|
||||||
Efl.Pack.contents_get;
|
Efl.Container.content_iterate;
|
||||||
Efl.Pack.contents_count;
|
Efl.Container.content_count;
|
||||||
Efl.Pack.pack_clear;
|
Efl.Pack.pack_clear;
|
||||||
Efl.Pack.unpack_all;
|
Efl.Pack.unpack_all;
|
||||||
Efl.Pack.unpack;
|
Efl.Pack.unpack;
|
||||||
|
@ -26,8 +26,8 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack_Grid, Efl.Pack_Layout)
|
||||||
Efl.Pack.pack_padding.get;
|
Efl.Pack.pack_padding.get;
|
||||||
Efl.Pack.pack_padding.set;
|
Efl.Pack.pack_padding.set;
|
||||||
Efl.Pack_Grid.pack_grid;
|
Efl.Pack_Grid.pack_grid;
|
||||||
Efl.Pack_Grid.grid_contents_at;
|
|
||||||
Efl.Pack_Grid.grid_content_at;
|
Efl.Pack_Grid.grid_content_at;
|
||||||
|
Efl.Pack_Grid.grid_content_iterate;
|
||||||
Efl.Pack_Grid.grid_content_position.set;
|
Efl.Pack_Grid.grid_content_position.set;
|
||||||
Efl.Pack_Grid.grid_content_position.get;
|
Efl.Pack_Grid.grid_content_position.get;
|
||||||
Efl.Pack_Grid.grid_size.set;
|
Efl.Pack_Grid.grid_size.set;
|
||||||
|
|
|
@ -773,13 +773,13 @@ _elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
|
||||||
/* kind of a big and tricky override here: an internal box will hold
|
/* kind of a big and tricky override here: an internal box will hold
|
||||||
* the actual content. content aliases won't be of much help here */
|
* the actual content. content aliases won't be of much help here */
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_ctxpopup_elm_container_content_set(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part, Evas_Object *content)
|
_elm_ctxpopup_efl_container_content_set(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_TRUE;
|
Eina_Bool int_ret = EINA_TRUE;
|
||||||
|
|
||||||
if ((part) && (strcmp(part, "default")))
|
if ((part) && (strcmp(part, "default")))
|
||||||
{
|
{
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
return int_ret;
|
return int_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -807,13 +807,13 @@ _elm_ctxpopup_elm_container_content_set(Eo *obj, Elm_Ctxpopup_Data *sd, const ch
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_ctxpopup_elm_container_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
|
_elm_ctxpopup_efl_container_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
|
|
||||||
if ((part) && (strcmp(part, "default")))
|
if ((part) && (strcmp(part, "default")))
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), part);
|
ret = efl_content_get(eo_super(obj, MY_CLASS), part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -821,13 +821,13 @@ _elm_ctxpopup_elm_container_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const ch
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_ctxpopup_elm_container_content_unset(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
|
_elm_ctxpopup_efl_container_content_unset(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
Evas_Object *content = NULL;
|
Evas_Object *content = NULL;
|
||||||
|
|
||||||
if ((part) && (strcmp(part, "default")))
|
if ((part) && (strcmp(part, "default")))
|
||||||
{
|
{
|
||||||
content = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
|
content = efl_content_unset(eo_super(obj, MY_CLASS), part);
|
||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1131,7 +1131,7 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
|
||||||
(priv->box, EVAS_CALLBACK_RESIZE, _on_content_resized, obj);
|
(priv->box, EVAS_CALLBACK_RESIZE, _on_content_resized, obj);
|
||||||
|
|
||||||
/* box will be our content placeholder, thus the parent's version call */
|
/* box will be our content placeholder, thus the parent's version call */
|
||||||
elm_obj_container_content_set(eo_super(obj, MY_CLASS), "elm.swallow.content", priv->box);
|
efl_content_set(eo_super(obj, MY_CLASS), "elm.swallow.content", priv->box);
|
||||||
|
|
||||||
evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _on_show, NULL);
|
evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _on_show, NULL);
|
||||||
evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _on_hide, NULL);
|
evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _on_hide, NULL);
|
||||||
|
|
|
@ -233,12 +233,12 @@ _elm_fileselector_entry_elm_layout_text_get(Eo *obj, Elm_Fileselector_Entry_Data
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_fileselector_entry_elm_container_content_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, Evas_Object *content)
|
_elm_fileselector_entry_efl_container_content_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
if (part && strcmp(part, "button icon"))
|
if (part && strcmp(part, "button icon"))
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_FALSE;
|
Eina_Bool int_ret = EINA_FALSE;
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
return int_ret;
|
return int_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -248,12 +248,12 @@ _elm_fileselector_entry_elm_container_content_set(Eo *obj, Elm_Fileselector_Entr
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object *
|
EOLIAN static Evas_Object *
|
||||||
_elm_fileselector_entry_elm_container_content_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part)
|
_elm_fileselector_entry_efl_container_content_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
if (part && strcmp(part, "button icon"))
|
if (part && strcmp(part, "button icon"))
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), part);
|
ret = efl_content_get(eo_super(obj, MY_CLASS), part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -261,12 +261,12 @@ _elm_fileselector_entry_elm_container_content_get(Eo *obj, Elm_Fileselector_Entr
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object *
|
EOLIAN static Evas_Object *
|
||||||
_elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part)
|
_elm_fileselector_entry_efl_container_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
if (part && strcmp(part, "button icon"))
|
if (part && strcmp(part, "button icon"))
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
|
ret = efl_content_unset(eo_super(obj, MY_CLASS), part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1044,7 +1044,7 @@ _elm_naviframe_elm_layout_text_get(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED,
|
||||||
/* we have to keep a "manual" set here because of the callbacks on the
|
/* we have to keep a "manual" set here because of the callbacks on the
|
||||||
* children */
|
* children */
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_naviframe_elm_container_content_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part, Evas_Object *content)
|
_elm_naviframe_efl_container_content_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Elm_Object_Item *it;
|
Elm_Object_Item *it;
|
||||||
|
|
||||||
|
@ -1060,7 +1060,7 @@ _elm_naviframe_elm_container_content_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UN
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_naviframe_elm_container_content_get(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part)
|
_elm_naviframe_efl_container_content_get(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part)
|
||||||
{
|
{
|
||||||
Elm_Object_Item *it = elm_naviframe_top_item_get(obj);
|
Elm_Object_Item *it = elm_naviframe_top_item_get(obj);
|
||||||
|
|
||||||
|
@ -1070,7 +1070,7 @@ _elm_naviframe_elm_container_content_get(Eo *obj, Elm_Naviframe_Data *sd EINA_UN
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_naviframe_elm_container_content_unset(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part)
|
_elm_naviframe_efl_container_content_unset(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part)
|
||||||
{
|
{
|
||||||
Elm_Object_Item *it = elm_naviframe_top_item_get(obj);
|
Elm_Object_Item *it = elm_naviframe_top_item_get(obj);
|
||||||
|
|
||||||
|
|
|
@ -577,7 +577,7 @@ _str_free(char *data)
|
||||||
* layout */
|
* layout */
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_player_elm_container_content_set(Eo *obj, Elm_Player_Data *sd, const char *part, Evas_Object *content)
|
_elm_player_efl_container_content_set(Eo *obj, Elm_Player_Data *sd, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_FALSE;
|
Eina_Bool int_ret = EINA_FALSE;
|
||||||
double pos, length;
|
double pos, length;
|
||||||
|
@ -585,11 +585,11 @@ _elm_player_elm_container_content_set(Eo *obj, Elm_Player_Data *sd, const char *
|
||||||
|
|
||||||
if (part && strcmp(part, "video"))
|
if (part && strcmp(part, "video"))
|
||||||
{
|
{
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
return int_ret;
|
return int_ret;
|
||||||
}
|
}
|
||||||
if ((!part) || (!strcmp(part, "video"))) part = "elm.swallow.content";
|
if ((!part) || (!strcmp(part, "video"))) part = "elm.swallow.content";
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
|
|
||||||
if (!_elm_video_check(content)) return EINA_FALSE;
|
if (!_elm_video_check(content)) return EINA_FALSE;
|
||||||
if (sd->video == content) goto end;
|
if (sd->video == content) goto end;
|
||||||
|
|
|
@ -525,7 +525,7 @@ _elm_popup_elm_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *s
|
||||||
{
|
{
|
||||||
if (sobj == it->icon)
|
if (sobj == it->icon)
|
||||||
{
|
{
|
||||||
elm_obj_container_content_unset(VIEW(it), CONTENT_PART);
|
efl_content_unset(VIEW(it), CONTENT_PART);
|
||||||
elm_layout_signal_emit(VIEW(it),
|
elm_layout_signal_emit(VIEW(it),
|
||||||
"elm,state,item,icon,hidden", "elm");
|
"elm,state,item,icon,hidden", "elm");
|
||||||
it->icon = NULL;
|
it->icon = NULL;
|
||||||
|
@ -670,8 +670,8 @@ _create_scroller(Evas_Object *obj)
|
||||||
_on_table_del, obj);
|
_on_table_del, obj);
|
||||||
if (!sd->scroll)
|
if (!sd->scroll)
|
||||||
{
|
{
|
||||||
elm_obj_container_content_set(sd->content_area, CONTENT_PART, sd->tbl);
|
efl_content_set(sd->content_area, CONTENT_PART, sd->tbl);
|
||||||
elm_obj_container_content_set(sd->main_layout, CONTENT_PART, sd->content_area);
|
efl_content_set(sd->main_layout, CONTENT_PART, sd->content_area);
|
||||||
}
|
}
|
||||||
|
|
||||||
//spacer
|
//spacer
|
||||||
|
@ -787,7 +787,7 @@ _item_icon_set(Elm_Popup_Item_Data *it,
|
||||||
{
|
{
|
||||||
elm_widget_sub_object_add(WIDGET(it), it->icon);
|
elm_widget_sub_object_add(WIDGET(it), it->icon);
|
||||||
evas_object_data_set(it->icon, "_popup_icon_parent_item", it);
|
evas_object_data_set(it->icon, "_popup_icon_parent_item", it);
|
||||||
elm_obj_container_content_set(VIEW(it), CONTENT_PART, it->icon);
|
efl_content_set(VIEW(it), CONTENT_PART, it->icon);
|
||||||
elm_layout_signal_emit(VIEW(it), "elm,state,item,icon,visible", "elm");
|
elm_layout_signal_emit(VIEW(it), "elm,state,item,icon,visible", "elm");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -831,7 +831,7 @@ _item_icon_unset(Elm_Popup_Item_Data *it)
|
||||||
if (!it->icon) return NULL;
|
if (!it->icon) return NULL;
|
||||||
elm_widget_sub_object_del(WIDGET(it), icon);
|
elm_widget_sub_object_del(WIDGET(it), icon);
|
||||||
evas_object_data_del(icon, "_popup_icon_parent_item");
|
evas_object_data_del(icon, "_popup_icon_parent_item");
|
||||||
elm_obj_container_content_unset(VIEW(it), CONTENT_PART);
|
efl_content_unset(VIEW(it), CONTENT_PART);
|
||||||
elm_layout_signal_emit(VIEW(it), "elm,state,item,icon,hidden", "elm");
|
elm_layout_signal_emit(VIEW(it), "elm,state,item,icon,hidden", "elm");
|
||||||
it->icon = NULL;
|
it->icon = NULL;
|
||||||
|
|
||||||
|
@ -1003,7 +1003,7 @@ _content_text_set(Evas_Object *obj,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!sd->scroll)
|
if (!sd->scroll)
|
||||||
elm_obj_container_content_set(sd->main_layout, CONTENT_PART, sd->content_area);
|
efl_content_set(sd->main_layout, CONTENT_PART, sd->content_area);
|
||||||
else
|
else
|
||||||
elm_object_content_set(sd->scr, sd->content_area);
|
elm_object_content_set(sd->scr, sd->content_area);
|
||||||
}
|
}
|
||||||
|
@ -1011,7 +1011,7 @@ _content_text_set(Evas_Object *obj,
|
||||||
|
|
||||||
if (sd->text_content_obj)
|
if (sd->text_content_obj)
|
||||||
{
|
{
|
||||||
sd->text_content_obj = elm_obj_container_content_unset(sd->content_area, CONTENT_PART);
|
sd->text_content_obj = efl_content_unset(sd->content_area, CONTENT_PART);
|
||||||
evas_object_del(sd->text_content_obj);
|
evas_object_del(sd->text_content_obj);
|
||||||
sd->text_content_obj = NULL;
|
sd->text_content_obj = NULL;
|
||||||
}
|
}
|
||||||
|
@ -1029,7 +1029,7 @@ _content_text_set(Evas_Object *obj,
|
||||||
(sd->text_content_obj, EVAS_HINT_EXPAND, 0.0);
|
(sd->text_content_obj, EVAS_HINT_EXPAND, 0.0);
|
||||||
evas_object_size_hint_align_set
|
evas_object_size_hint_align_set
|
||||||
(sd->text_content_obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
(sd->text_content_obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||||
elm_obj_container_content_set
|
efl_content_set
|
||||||
(sd->content_area, CONTENT_PART, sd->text_content_obj);
|
(sd->content_area, CONTENT_PART, sd->text_content_obj);
|
||||||
|
|
||||||
/* access */
|
/* access */
|
||||||
|
@ -1117,7 +1117,7 @@ _title_icon_set(Evas_Object *obj,
|
||||||
sd->title_icon = icon;
|
sd->title_icon = icon;
|
||||||
title_visibility_current = (sd->title_text) || (sd->title_icon);
|
title_visibility_current = (sd->title_text) || (sd->title_icon);
|
||||||
|
|
||||||
elm_obj_container_content_set
|
efl_content_set
|
||||||
(sd->main_layout, "elm.swallow.title.icon", sd->title_icon);
|
(sd->main_layout, "elm.swallow.title.icon", sd->title_icon);
|
||||||
|
|
||||||
if (sd->title_icon)
|
if (sd->title_icon)
|
||||||
|
@ -1144,12 +1144,12 @@ _content_set(Evas_Object *obj,
|
||||||
if (content)
|
if (content)
|
||||||
{
|
{
|
||||||
if (!sd->scroll)
|
if (!sd->scroll)
|
||||||
elm_obj_container_content_set
|
efl_content_set
|
||||||
(sd->main_layout, CONTENT_PART, sd->content_area);
|
(sd->main_layout, CONTENT_PART, sd->content_area);
|
||||||
else
|
else
|
||||||
elm_object_content_set(sd->scr, sd->content_area);
|
elm_object_content_set(sd->scr, sd->content_area);
|
||||||
|
|
||||||
elm_obj_container_content_set
|
efl_content_set
|
||||||
(sd->content_area, CONTENT_PART, content);
|
(sd->content_area, CONTENT_PART, content);
|
||||||
|
|
||||||
evas_object_event_callback_add
|
evas_object_event_callback_add
|
||||||
|
@ -1206,7 +1206,7 @@ _action_button_set(Evas_Object *obj,
|
||||||
evas_object_event_callback_add
|
evas_object_event_callback_add
|
||||||
(sd->action_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
(sd->action_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||||
_size_hints_changed_cb, sd->main_layout);
|
_size_hints_changed_cb, sd->main_layout);
|
||||||
elm_obj_container_content_set
|
efl_content_set
|
||||||
(sd->main_layout, "elm.swallow.action_area", sd->action_area);
|
(sd->main_layout, "elm.swallow.action_area", sd->action_area);
|
||||||
|
|
||||||
_visuals_set(obj);
|
_visuals_set(obj);
|
||||||
|
@ -1222,7 +1222,7 @@ _action_button_set(Evas_Object *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
_elm_popup_efl_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
Eina_Bool ret = EINA_TRUE;
|
Eina_Bool ret = EINA_TRUE;
|
||||||
|
@ -1244,7 +1244,7 @@ _elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, c
|
||||||
_action_button_set(obj, content, i);
|
_action_button_set(obj, content, i);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
ret = elm_obj_container_content_set(_pd->main_layout, part, content);
|
ret = efl_content_set(_pd->main_layout, part, content);
|
||||||
|
|
||||||
elm_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
|
@ -1279,7 +1279,7 @@ _action_button_get(const Evas_Object *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_popup_elm_container_content_get(Eo *obj, Elm_Popup_Data *_pd, const char *part)
|
_elm_popup_efl_container_content_get(Eo *obj, Elm_Popup_Data *_pd, const char *part)
|
||||||
{
|
{
|
||||||
Evas_Object *content = NULL;
|
Evas_Object *content = NULL;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -1298,7 +1298,7 @@ _elm_popup_elm_container_content_get(Eo *obj, Elm_Popup_Data *_pd, const char *p
|
||||||
content = _action_button_get(obj, i);
|
content = _action_button_get(obj, i);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
content = elm_obj_container_content_get(_pd->main_layout, part);
|
content = efl_content_get(_pd->main_layout, part);
|
||||||
|
|
||||||
if (!content)
|
if (!content)
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -1322,7 +1322,7 @@ _content_unset(Evas_Object *obj)
|
||||||
evas_object_event_callback_del
|
evas_object_event_callback_del
|
||||||
(sd->content, EVAS_CALLBACK_DEL, _on_content_del);
|
(sd->content, EVAS_CALLBACK_DEL, _on_content_del);
|
||||||
|
|
||||||
content = elm_obj_container_content_unset(sd->content_area, CONTENT_PART);
|
content = efl_content_unset(sd->content_area, CONTENT_PART);
|
||||||
sd->content = NULL;
|
sd->content = NULL;
|
||||||
|
|
||||||
elm_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
@ -1340,14 +1340,14 @@ _title_icon_unset(Evas_Object *obj)
|
||||||
if (!sd->title_icon) return NULL;
|
if (!sd->title_icon) return NULL;
|
||||||
|
|
||||||
icon = sd->title_icon;
|
icon = sd->title_icon;
|
||||||
elm_obj_container_content_unset(sd->main_layout, "elm.swallow.title.icon");
|
efl_content_unset(sd->main_layout, "elm.swallow.title.icon");
|
||||||
sd->title_icon = NULL;
|
sd->title_icon = NULL;
|
||||||
|
|
||||||
return icon;
|
return icon;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_popup_elm_container_content_unset(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part)
|
_elm_popup_efl_container_content_unset(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part)
|
||||||
{
|
{
|
||||||
Evas_Object *content = NULL;
|
Evas_Object *content = NULL;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -1402,7 +1402,7 @@ _elm_popup_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, Elm_Fo
|
||||||
if (ao) items = eina_list_append(items, ao);
|
if (ao) items = eina_list_append(items, ao);
|
||||||
}
|
}
|
||||||
|
|
||||||
base_it = elm_obj_container_content_objects_iterate(sd->main_layout);
|
base_it = efl_content_iterate(sd->main_layout);
|
||||||
EINA_ITERATOR_FOREACH(base_it, ao)
|
EINA_ITERATOR_FOREACH(base_it, ao)
|
||||||
if (ao) items = eina_list_append(items, ao);
|
if (ao) items = eina_list_append(items, ao);
|
||||||
eina_iterator_free(base_it);
|
eina_iterator_free(base_it);
|
||||||
|
@ -1440,7 +1440,7 @@ _elm_popup_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, c
|
||||||
if (ao) items = eina_list_append(items, ao);
|
if (ao) items = eina_list_append(items, ao);
|
||||||
}
|
}
|
||||||
|
|
||||||
base_it = elm_obj_container_content_objects_iterate(sd->main_layout);
|
base_it = efl_content_iterate(sd->main_layout);
|
||||||
EINA_ITERATOR_FOREACH(base_it, ao)
|
EINA_ITERATOR_FOREACH(base_it, ao)
|
||||||
if (ao) items = eina_list_append(items, ao);
|
if (ao) items = eina_list_append(items, ao);
|
||||||
eina_iterator_free(base_it);
|
eina_iterator_free(base_it);
|
||||||
|
@ -1785,7 +1785,7 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Obje
|
||||||
if (sd->content || sd->text_content_obj)
|
if (sd->content || sd->text_content_obj)
|
||||||
{
|
{
|
||||||
prev_content =
|
prev_content =
|
||||||
elm_obj_container_content_get(sd->content_area, CONTENT_PART);
|
efl_content_get(sd->content_area, CONTENT_PART);
|
||||||
evas_object_del(prev_content);
|
evas_object_del(prev_content);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1826,14 +1826,14 @@ _elm_popup_scrollable_set(Eo *obj, Elm_Popup_Data *pd, Eina_Bool scroll)
|
||||||
|
|
||||||
if (!pd->scroll)
|
if (!pd->scroll)
|
||||||
{
|
{
|
||||||
elm_obj_container_content_set(pd->content_area, CONTENT_PART, pd->tbl);
|
efl_content_set(pd->content_area, CONTENT_PART, pd->tbl);
|
||||||
elm_obj_container_content_set(pd->main_layout, CONTENT_PART, pd->content_area);
|
efl_content_set(pd->main_layout, CONTENT_PART, pd->content_area);
|
||||||
if (pd->theme_scroll)
|
if (pd->theme_scroll)
|
||||||
elm_layout_signal_emit(pd->content_area, "elm,scroll,disable", "elm");
|
elm_layout_signal_emit(pd->content_area, "elm,scroll,disable", "elm");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
elm_obj_container_content_set(pd->main_layout, CONTENT_PART, pd->tbl);
|
efl_content_set(pd->main_layout, CONTENT_PART, pd->tbl);
|
||||||
if (pd->theme_scroll)
|
if (pd->theme_scroll)
|
||||||
elm_layout_signal_emit(pd->content_area, "elm,scroll,enable", "elm");
|
elm_layout_signal_emit(pd->content_area, "elm,scroll,enable", "elm");
|
||||||
}
|
}
|
||||||
|
|
|
@ -148,11 +148,11 @@ _elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
|
||||||
* is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
|
* is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
|
||||||
* can changed the theme API */
|
* can changed the theme API */
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_button_elm_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
_elm_button_efl_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_FALSE;
|
Eina_Bool int_ret = EINA_FALSE;
|
||||||
|
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
if (!int_ret) return EINA_FALSE;
|
if (!int_ret) return EINA_FALSE;
|
||||||
|
|
||||||
_icon_signal_emit(obj);
|
_icon_signal_emit(obj);
|
||||||
|
|
|
@ -93,7 +93,7 @@ class Elm.Button (Elm.Layout, Evas.Clickable_Interface,
|
||||||
Elm.Widget.theme_apply;
|
Elm.Widget.theme_apply;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Widget.event;
|
Elm.Widget.event;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Layout.text_aliases.get;
|
Elm.Layout.text_aliases.get;
|
||||||
Elm.Layout.content_aliases.get;
|
Elm.Layout.content_aliases.get;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "elementary_config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <Elementary.h>
|
|
||||||
#include "elm_priv.h"
|
|
||||||
#include "elm_widget_container.h"
|
|
||||||
|
|
||||||
#define MY_CLASS ELM_CONTAINER_CLASS
|
|
||||||
|
|
||||||
#define MY_CLASS_NAME "Elm_Container"
|
|
||||||
|
|
||||||
#include "elm_container.eo.c"
|
|
|
@ -1,45 +0,0 @@
|
||||||
class Elm.Container (Elm.Widget)
|
|
||||||
{
|
|
||||||
legacy_prefix: null;
|
|
||||||
eo_prefix: elm_obj_container;
|
|
||||||
data: null;
|
|
||||||
methods {
|
|
||||||
@property content {
|
|
||||||
[[Swallowed sub-object contained in this object.]]
|
|
||||||
set {
|
|
||||||
return: bool;
|
|
||||||
}
|
|
||||||
get {}
|
|
||||||
keys {
|
|
||||||
name: const(char)*; [[the part in which to swallow the object]]
|
|
||||||
}
|
|
||||||
values {
|
|
||||||
content: Evas.Object*; [[the object to swallow.]]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
content_unset {
|
|
||||||
[[Unswallow the object in the given part of the container and return it.]]
|
|
||||||
params {
|
|
||||||
@in name: const(char)* @nullable;
|
|
||||||
}
|
|
||||||
return: Evas.Object *;
|
|
||||||
}
|
|
||||||
content_names_iterate {
|
|
||||||
[[Returns an iterator on all parts in this container that currently
|
|
||||||
hold a sub-object.]]
|
|
||||||
return: free(own(iterator<const(char)*> *), eina_iterator_free);
|
|
||||||
}
|
|
||||||
content_objects_iterate {
|
|
||||||
[[Returns an iterator on all swallowed objects in this container.]]
|
|
||||||
return: free(own(iterator<Evas.Object*> *), eina_iterator_free);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
implements {
|
|
||||||
@virtual .content_unset;
|
|
||||||
@virtual .content.get;
|
|
||||||
@virtual .content.set;
|
|
||||||
@virtual .content_names_iterate;
|
|
||||||
@virtual .content_objects_iterate;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifdef EFL_EO_API_SUPPORT
|
|
||||||
#include <elm_container.eo.h>
|
|
||||||
#endif
|
|
||||||
#ifndef EFL_NOLEGACY_API_SUPPORT
|
|
||||||
#include <elm_container.eo.legacy.h>
|
|
||||||
#endif
|
|
|
@ -212,9 +212,9 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface_Atspi_Widget_Action, Efl.Orientati
|
||||||
Elm.Widget.translate;
|
Elm.Widget.translate;
|
||||||
Elm.Widget.theme_apply;
|
Elm.Widget.theme_apply;
|
||||||
Elm.Widget.event;
|
Elm.Widget.event;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Layout.sub_object_add_enable;
|
Elm.Layout.sub_object_add_enable;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
|
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
|
||||||
|
|
|
@ -217,7 +217,7 @@ _item_find(const Evas_Object *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item, Evas_Object *content)
|
_elm_dayselector_efl_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_FALSE;
|
Eina_Bool int_ret = EINA_FALSE;
|
||||||
|
|
||||||
|
@ -239,7 +239,7 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
|
||||||
{
|
{
|
||||||
snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
|
snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
|
||||||
|
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), buf, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), buf, content);
|
||||||
if (!int_ret) return EINA_FALSE;
|
if (!int_ret) return EINA_FALSE;
|
||||||
|
|
||||||
if (!content) return EINA_TRUE; /* item deletion already handled */
|
if (!content) return EINA_TRUE; /* item deletion already handled */
|
||||||
|
@ -255,7 +255,7 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
|
snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
|
||||||
|
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), buf, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), buf, content);
|
||||||
if (!int_ret)
|
if (!int_ret)
|
||||||
{
|
{
|
||||||
eo_del(eo_it);
|
eo_del(eo_it);
|
||||||
|
@ -299,7 +299,7 @@ _elm_dayselector_item_eo_base_constructor(Eo *eo_item, Elm_Dayselector_Item_Data
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_dayselector_elm_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd, const char *item)
|
_elm_dayselector_efl_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd, const char *item)
|
||||||
{
|
{
|
||||||
int day;
|
int day;
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
@ -314,7 +314,7 @@ _elm_dayselector_elm_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd,
|
||||||
|
|
||||||
content = VIEW(it);
|
content = VIEW(it);
|
||||||
|
|
||||||
content = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), buf);
|
content = efl_content_unset(eo_super(obj, MY_CLASS), buf);
|
||||||
if (!content) return NULL;
|
if (!content) return NULL;
|
||||||
|
|
||||||
sd->items = eina_list_remove(sd->items, it);
|
sd->items = eina_list_remove(sd->items, it);
|
||||||
|
|
|
@ -153,8 +153,8 @@ class Elm.Dayselector (Elm.Layout)
|
||||||
Elm.Widget.theme_apply;
|
Elm.Widget.theme_apply;
|
||||||
Elm.Widget.focus_direction_manager_is;
|
Elm.Widget.focus_direction_manager_is;
|
||||||
Elm.Widget.translate;
|
Elm.Widget.translate;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
|
|
|
@ -2993,10 +2993,10 @@ _elm_entry_elm_layout_signal_callback_del(Eo *obj, Elm_Entry_Data *sd, const cha
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_entry_elm_container_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
_elm_entry_efl_container_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_FALSE;
|
Eina_Bool int_ret = EINA_FALSE;
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
if (!int_ret) return EINA_FALSE;
|
if (!int_ret) return EINA_FALSE;
|
||||||
|
|
||||||
/* too bad entry does not follow the pattern
|
/* too bad entry does not follow the pattern
|
||||||
|
@ -3011,10 +3011,10 @@ _elm_entry_elm_container_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, c
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_entry_elm_container_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part)
|
_elm_entry_efl_container_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part)
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
|
ret = efl_content_unset(eo_super(obj, MY_CLASS), part);
|
||||||
if (!ret) return NULL;
|
if (!ret) return NULL;
|
||||||
|
|
||||||
/* too bad entry does not follow the pattern
|
/* too bad entry does not follow the pattern
|
||||||
|
|
|
@ -937,8 +937,8 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
|
||||||
Elm.Widget.disable;
|
Elm.Widget.disable;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Widget.focus_next_manager_is;
|
Elm.Widget.focus_next_manager_is;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Layout.theme_enable;
|
Elm.Layout.theme_enable;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
Elm.Layout.text.get;
|
Elm.Layout.text.get;
|
||||||
|
|
|
@ -90,9 +90,9 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface_Fileselector,
|
||||||
Elm.Widget.focus_next;
|
Elm.Widget.focus_next;
|
||||||
Elm.Widget.disable;
|
Elm.Widget.disable;
|
||||||
Elm.Widget.focus_direction_manager_is;
|
Elm.Widget.focus_direction_manager_is;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Layout.text.set;
|
Elm.Layout.text.set;
|
||||||
Elm.Layout.text.get;
|
Elm.Layout.text.get;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
|
|
|
@ -1771,7 +1771,7 @@ _flip_content_unset(Evas_Object *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_flip_elm_container_content_set(Eo *obj, Elm_Flip_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
_elm_flip_efl_container_content_set(Eo *obj, Elm_Flip_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
if (!part || !strcmp(part, "front"))
|
if (!part || !strcmp(part, "front"))
|
||||||
return _flip_content_set(obj, content, EINA_TRUE);
|
return _flip_content_set(obj, content, EINA_TRUE);
|
||||||
|
@ -1781,7 +1781,7 @@ _elm_flip_elm_container_content_set(Eo *obj, Elm_Flip_Data *_pd EINA_UNUSED, con
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_flip_elm_container_content_get(Eo *obj EINA_UNUSED, Elm_Flip_Data *sd, const char *part)
|
_elm_flip_efl_container_content_get(Eo *obj EINA_UNUSED, Elm_Flip_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
if (!part || !strcmp(part, "front"))
|
if (!part || !strcmp(part, "front"))
|
||||||
return sd->front.content;
|
return sd->front.content;
|
||||||
|
@ -1791,7 +1791,7 @@ _elm_flip_elm_container_content_get(Eo *obj EINA_UNUSED, Elm_Flip_Data *sd, cons
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_flip_elm_container_content_unset(Eo *obj EINA_UNUSED, Elm_Flip_Data *_pd EINA_UNUSED, const char *part)
|
_elm_flip_efl_container_content_unset(Eo *obj EINA_UNUSED, Elm_Flip_Data *_pd EINA_UNUSED, const char *part)
|
||||||
{
|
{
|
||||||
if (!part || !strcmp(part, "front"))
|
if (!part || !strcmp(part, "front"))
|
||||||
return _flip_content_unset(obj, EINA_TRUE);
|
return _flip_content_unset(obj, EINA_TRUE);
|
||||||
|
|
|
@ -33,7 +33,7 @@ enum Elm.Flip.Direction
|
||||||
right [[Allows interaction with the right portion of the widget]]
|
right [[Allows interaction with the right portion of the widget]]
|
||||||
}
|
}
|
||||||
|
|
||||||
class Elm.Flip (Elm.Container)
|
class Elm.Flip (Elm.Widget, Efl.Container)
|
||||||
{
|
{
|
||||||
eo_prefix: elm_obj_flip;
|
eo_prefix: elm_obj_flip;
|
||||||
methods {
|
methods {
|
||||||
|
@ -238,9 +238,9 @@ class Elm.Flip (Elm.Container)
|
||||||
Elm.Widget.focus_next_manager_is;
|
Elm.Widget.focus_next_manager_is;
|
||||||
Elm.Widget.focus_next;
|
Elm.Widget.focus_next;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
animate,begin;
|
animate,begin;
|
||||||
|
|
|
@ -396,7 +396,7 @@ _elm_hover_subs_del(Elm_Hover_Data *sd)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_hover_elm_container_content_set(Eo *obj, Elm_Hover_Data *sd, const char *swallow, Evas_Object *content)
|
_elm_hover_efl_container_content_set(Eo *obj, Elm_Hover_Data *sd, const char *swallow, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret;
|
Eina_Bool int_ret;
|
||||||
|
|
||||||
|
@ -434,7 +434,7 @@ _elm_hover_elm_container_content_set(Eo *obj, Elm_Hover_Data *sd, const char *sw
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), swallow, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), swallow, content);
|
||||||
if (!int_ret) return EINA_FALSE;
|
if (!int_ret) return EINA_FALSE;
|
||||||
|
|
||||||
if (strstr(swallow, "elm.swallow.slot."))
|
if (strstr(swallow, "elm.swallow.slot."))
|
||||||
|
@ -455,7 +455,7 @@ end:
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_hover_elm_container_content_get(Eo *obj, Elm_Hover_Data *sd, const char *swallow)
|
_elm_hover_efl_container_content_get(Eo *obj, Elm_Hover_Data *sd, const char *swallow)
|
||||||
{
|
{
|
||||||
Evas_Object *ret;
|
Evas_Object *ret;
|
||||||
ret = NULL;
|
ret = NULL;
|
||||||
|
@ -463,25 +463,25 @@ _elm_hover_elm_container_content_get(Eo *obj, Elm_Hover_Data *sd, const char *sw
|
||||||
if (!swallow) return ret;
|
if (!swallow) return ret;
|
||||||
|
|
||||||
if (!strcmp(swallow, "smart"))
|
if (!strcmp(swallow, "smart"))
|
||||||
ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), sd->smt_sub->swallow);
|
ret = efl_content_get(eo_super(obj, MY_CLASS), sd->smt_sub->swallow);
|
||||||
else
|
else
|
||||||
ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), swallow);
|
ret = efl_content_get(eo_super(obj, MY_CLASS), swallow);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_hover_elm_container_content_unset(Eo *obj, Elm_Hover_Data *sd, const char *swallow)
|
_elm_hover_efl_container_content_unset(Eo *obj, Elm_Hover_Data *sd, const char *swallow)
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
|
|
||||||
if (!swallow) return NULL;
|
if (!swallow) return NULL;
|
||||||
|
|
||||||
if (!strcmp(swallow, "smart"))
|
if (!strcmp(swallow, "smart"))
|
||||||
ret = elm_obj_container_content_unset
|
ret = efl_content_unset
|
||||||
(eo_super(obj, MY_CLASS), sd->smt_sub->swallow);
|
(eo_super(obj, MY_CLASS), sd->smt_sub->swallow);
|
||||||
else
|
else
|
||||||
ret = elm_obj_container_content_unset
|
ret = efl_content_unset
|
||||||
(eo_super(obj, MY_CLASS), swallow);
|
(eo_super(obj, MY_CLASS), swallow);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,9 +70,9 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm.Interface_Atspi_Widge
|
||||||
Elm.Widget.focus_direction_manager_is;
|
Elm.Widget.focus_direction_manager_is;
|
||||||
Elm.Widget.focus_next_manager_is;
|
Elm.Widget.focus_next_manager_is;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
Elm.Layout.content_aliases.get;
|
Elm.Layout.content_aliases.get;
|
||||||
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
|
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
|
||||||
|
|
|
@ -140,7 +140,7 @@ elm_win_inwin_content_set(Evas_Object *obj,
|
||||||
Evas_Object *content)
|
Evas_Object *content)
|
||||||
{
|
{
|
||||||
ELM_INWIN_CHECK(obj);
|
ELM_INWIN_CHECK(obj);
|
||||||
elm_obj_container_content_set(obj, NULL, content);
|
efl_content_set(obj, NULL, content);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Object *
|
EAPI Evas_Object *
|
||||||
|
@ -148,7 +148,7 @@ elm_win_inwin_content_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_INWIN_CHECK(obj) NULL;
|
ELM_INWIN_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_get((Eo *)obj, NULL);
|
ret = efl_content_get((Eo *)obj, NULL);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,7 +157,7 @@ elm_win_inwin_content_unset(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_INWIN_CHECK(obj) NULL;
|
ELM_INWIN_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_unset(obj, NULL);
|
ret = efl_content_unset(obj, NULL);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -973,12 +973,12 @@ elm_layout_content_set(Evas_Object *obj,
|
||||||
{
|
{
|
||||||
ELM_LAYOUT_CHECK(obj) EINA_FALSE;
|
ELM_LAYOUT_CHECK(obj) EINA_FALSE;
|
||||||
Eina_Bool ret = EINA_FALSE;
|
Eina_Bool ret = EINA_FALSE;
|
||||||
ret = elm_obj_container_content_set(obj, swallow, content);
|
ret = efl_content_set(obj, swallow, content);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_layout_elm_container_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *content)
|
_elm_layout_efl_container_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Elm_Layout_Sub_Object_Data *sub_d;
|
Elm_Layout_Sub_Object_Data *sub_d;
|
||||||
const Eina_List *l;
|
const Eina_List *l;
|
||||||
|
@ -1051,12 +1051,12 @@ elm_layout_content_get(const Evas_Object *obj,
|
||||||
{
|
{
|
||||||
ELM_LAYOUT_CHECK(obj) NULL;
|
ELM_LAYOUT_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_get((Eo *) obj, swallow);
|
ret = efl_content_get((Eo *) obj, swallow);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_layout_elm_container_content_get(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
|
_elm_layout_efl_container_content_get(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
const Eina_List *l;
|
const Eina_List *l;
|
||||||
Elm_Layout_Sub_Object_Data *sub_d;
|
Elm_Layout_Sub_Object_Data *sub_d;
|
||||||
|
@ -1078,12 +1078,12 @@ elm_layout_content_unset(Evas_Object *obj,
|
||||||
{
|
{
|
||||||
ELM_LAYOUT_CHECK(obj) NULL;
|
ELM_LAYOUT_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_unset(obj, swallow);
|
ret = efl_content_unset(obj, swallow);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_layout_elm_container_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
|
_elm_layout_efl_container_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
Elm_Layout_Sub_Object_Data *sub_d;
|
Elm_Layout_Sub_Object_Data *sub_d;
|
||||||
const Eina_List *l;
|
const Eina_List *l;
|
||||||
|
@ -1140,19 +1140,7 @@ elm_layout_content_swallow_list_get(const Evas_Object *obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_names_iterator_next(Elm_Layout_Sub_Iterator *it, void **data)
|
_sub_iterator_next(Elm_Layout_Sub_Iterator *it, void **data)
|
||||||
{
|
|
||||||
Elm_Layout_Sub_Object_Data *sub;
|
|
||||||
|
|
||||||
if (!eina_iterator_next(it->real_iterator, (void **)&sub))
|
|
||||||
return EINA_FALSE;
|
|
||||||
|
|
||||||
if (data) *data = (void*) sub->part;
|
|
||||||
return EINA_TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Eina_Bool
|
|
||||||
_objects_iterator_next(Elm_Layout_Sub_Iterator *it, void **data)
|
|
||||||
{
|
{
|
||||||
Elm_Layout_Sub_Object_Data *sub;
|
Elm_Layout_Sub_Object_Data *sub;
|
||||||
|
|
||||||
|
@ -1177,7 +1165,7 @@ _sub_iterator_free(Elm_Layout_Sub_Iterator *it)
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Iterator *
|
static Eina_Iterator *
|
||||||
_sub_iterator_create(Eo *eo_obj, Elm_Layout_Smart_Data *sd, Eina_Bool objects)
|
_sub_iterator_create(Eo *eo_obj, Elm_Layout_Smart_Data *sd)
|
||||||
{
|
{
|
||||||
Elm_Layout_Sub_Iterator *it;
|
Elm_Layout_Sub_Iterator *it;
|
||||||
|
|
||||||
|
@ -1188,28 +1176,42 @@ _sub_iterator_create(Eo *eo_obj, Elm_Layout_Smart_Data *sd, Eina_Bool objects)
|
||||||
|
|
||||||
it->real_iterator = eina_list_iterator_new(sd->subs);
|
it->real_iterator = eina_list_iterator_new(sd->subs);
|
||||||
it->iterator.version = EINA_ITERATOR_VERSION;
|
it->iterator.version = EINA_ITERATOR_VERSION;
|
||||||
|
it->iterator.next = FUNC_ITERATOR_NEXT(_sub_iterator_next);
|
||||||
it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_sub_iterator_get_container);
|
it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_sub_iterator_get_container);
|
||||||
it->iterator.free = FUNC_ITERATOR_FREE(_sub_iterator_free);
|
it->iterator.free = FUNC_ITERATOR_FREE(_sub_iterator_free);
|
||||||
|
|
||||||
if (objects)
|
|
||||||
it->iterator.next = FUNC_ITERATOR_NEXT(_objects_iterator_next);
|
|
||||||
else
|
|
||||||
it->iterator.next = FUNC_ITERATOR_NEXT(_names_iterator_next);
|
|
||||||
it->object = eo_obj;
|
it->object = eo_obj;
|
||||||
|
|
||||||
return &it->iterator;
|
return &it->iterator;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Iterator *
|
EOLIAN static Eina_Iterator *
|
||||||
_elm_layout_elm_container_content_names_iterate(Eo *eo_obj, Elm_Layout_Smart_Data *sd)
|
_elm_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
|
||||||
{
|
{
|
||||||
return _sub_iterator_create(eo_obj, sd, EINA_FALSE);
|
return _sub_iterator_create(eo_obj, sd);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Iterator *
|
EOLIAN static const char *
|
||||||
_elm_layout_elm_container_content_objects_iterate(Eo *eo_obj, Elm_Layout_Smart_Data *sd)
|
_elm_layout_efl_container_content_part_name_get(Eo *eo_obj EINA_UNUSED,
|
||||||
|
Elm_Layout_Smart_Data *sd,
|
||||||
|
Efl_Gfx_Base *content)
|
||||||
{
|
{
|
||||||
return _sub_iterator_create(eo_obj, sd, EINA_TRUE);
|
Elm_Layout_Sub_Object_Data *sub;
|
||||||
|
Eina_List *l;
|
||||||
|
|
||||||
|
EINA_LIST_FOREACH(sd->subs, l, sub)
|
||||||
|
if (sub->type == SWALLOW)
|
||||||
|
{
|
||||||
|
if (sub->obj == content)
|
||||||
|
return sub->part;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
EOLIAN static int
|
||||||
|
_elm_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
|
EOLIAN static Eina_Bool
|
||||||
|
|
|
@ -17,7 +17,7 @@ struct Elm.Layout_Part_Alias_Description
|
||||||
real_part: const(char)*; [[Target part name for the alias set on Elm.Layout_Part_Proxies_Description::real_part. An example of usage would be "default" on that field, with "elm.content.swallow" on this one]]
|
real_part: const(char)*; [[Target part name for the alias set on Elm.Layout_Part_Proxies_Description::real_part. An example of usage would be "default" on that field, with "elm.content.swallow" on this one]]
|
||||||
}
|
}
|
||||||
|
|
||||||
class Elm.Layout (Elm.Container, Efl.File)
|
class Elm.Layout (Elm.Widget, Efl.Container, Efl.File)
|
||||||
{
|
{
|
||||||
eo_prefix: elm_obj_layout;
|
eo_prefix: elm_obj_layout;
|
||||||
data: Elm_Layout_Smart_Data;
|
data: Elm_Layout_Smart_Data;
|
||||||
|
@ -489,11 +489,12 @@ class Elm.Layout (Elm.Container, Efl.File)
|
||||||
Elm.Widget.disable;
|
Elm.Widget.disable;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Widget.on_focus;
|
Elm.Widget.on_focus;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Container.content_names_iterate;
|
Efl.Container.content_part_name.get;
|
||||||
Elm.Container.content_objects_iterate;
|
Efl.Container.content_count;
|
||||||
|
Efl.Container.content_iterate;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
theme,changed;
|
theme,changed;
|
||||||
|
|
|
@ -190,7 +190,7 @@ _elm_mapbuf_evas_object_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_mapbuf_elm_container_content_set(Eo *obj, Elm_Mapbuf_Data *sd, const char *part, Evas_Object *content)
|
_elm_mapbuf_efl_container_content_set(Eo *obj, Elm_Mapbuf_Data *sd, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
|
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
|
||||||
|
|
||||||
|
@ -222,14 +222,14 @@ _elm_mapbuf_elm_container_content_set(Eo *obj, Elm_Mapbuf_Data *sd, const char *
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_mapbuf_elm_container_content_get(Eo *obj EINA_UNUSED, Elm_Mapbuf_Data *sd, const char *part)
|
_elm_mapbuf_efl_container_content_get(Eo *obj EINA_UNUSED, Elm_Mapbuf_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
if (part && strcmp(part, "default")) return NULL;
|
if (part && strcmp(part, "default")) return NULL;
|
||||||
return sd->content;
|
return sd->content;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_mapbuf_elm_container_content_unset(Eo *obj, Elm_Mapbuf_Data *sd, const char *part)
|
_elm_mapbuf_efl_container_content_unset(Eo *obj, Elm_Mapbuf_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
Evas_Object *content;
|
Evas_Object *content;
|
||||||
if (part && strcmp(part, "default")) return NULL;
|
if (part && strcmp(part, "default")) return NULL;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Elm.Mapbuf (Elm.Container)
|
class Elm.Mapbuf (Elm.Widget, Efl.Container)
|
||||||
{
|
{
|
||||||
eo_prefix: elm_obj_mapbuf;
|
eo_prefix: elm_obj_mapbuf;
|
||||||
methods {
|
methods {
|
||||||
|
@ -136,9 +136,9 @@ class Elm.Mapbuf (Elm.Container)
|
||||||
Evas.Object_Smart.resize;
|
Evas.Object_Smart.resize;
|
||||||
Elm.Widget.theme_apply;
|
Elm.Widget.theme_apply;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,9 +151,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
|
||||||
Elm.Widget.translate;
|
Elm.Widget.translate;
|
||||||
Elm.Widget.theme_apply;
|
Elm.Widget.theme_apply;
|
||||||
Elm.Widget.event;
|
Elm.Widget.event;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Layout.text.set;
|
Elm.Layout.text.set;
|
||||||
Elm.Layout.text.get;
|
Elm.Layout.text.get;
|
||||||
Elm.Layout.signal_emit;
|
Elm.Layout.signal_emit;
|
||||||
|
|
|
@ -371,7 +371,7 @@ _elm_notify_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_notify_elm_container_content_set(Eo *obj, Elm_Notify_Data *sd, const char *part, Evas_Object *content)
|
_elm_notify_efl_container_content_set(Eo *obj, Elm_Notify_Data *sd, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
if (part && strcmp(part, "default")) return EINA_FALSE;
|
if (part && strcmp(part, "default")) return EINA_FALSE;
|
||||||
if (sd->content == content) return EINA_TRUE;
|
if (sd->content == content) return EINA_TRUE;
|
||||||
|
@ -394,7 +394,7 @@ _elm_notify_elm_container_content_set(Eo *obj, Elm_Notify_Data *sd, const char *
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_notify_elm_container_content_get(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd, const char *part)
|
_elm_notify_efl_container_content_get(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
if (part && strcmp(part, "default")) return NULL;
|
if (part && strcmp(part, "default")) return NULL;
|
||||||
|
|
||||||
|
@ -402,7 +402,7 @@ _elm_notify_elm_container_content_get(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_notify_elm_container_content_unset(Eo *obj, Elm_Notify_Data *sd, const char *part)
|
_elm_notify_efl_container_content_unset(Eo *obj, Elm_Notify_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
Evas_Object *content;
|
Evas_Object *content;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Elm.Notify (Elm.Container)
|
class Elm.Notify (Elm.Widget, Efl.Container)
|
||||||
{
|
{
|
||||||
eo_prefix: elm_obj_notify;
|
eo_prefix: elm_obj_notify;
|
||||||
methods {
|
methods {
|
||||||
|
@ -92,9 +92,9 @@ class Elm.Notify (Elm.Container)
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Widget.part_text.set;
|
Elm.Widget.part_text.set;
|
||||||
Elm.Widget.part_text.get;
|
Elm.Widget.part_text.get;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
block,clicked;
|
block,clicked;
|
||||||
|
|
|
@ -247,7 +247,7 @@ _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
|
||||||
|
|
||||||
if (edje_object_part_exists
|
if (edje_object_part_exists
|
||||||
(wd->resize_obj, "elm.swallow.event"))
|
(wd->resize_obj, "elm.swallow.event"))
|
||||||
elm_obj_container_content_set(eo_super(obj, MY_CLASS), "elm.swallow.event", sd->event);
|
efl_content_set(eo_super(obj, MY_CLASS), "elm.swallow.event", sd->event);
|
||||||
}
|
}
|
||||||
|
|
||||||
elm_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
@ -910,7 +910,7 @@ _elm_panel_elm_widget_event(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED, Evas_Objec
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_panel_elm_container_content_set(Eo *obj, Elm_Panel_Data *sd, const char *part, Evas_Object *content)
|
_elm_panel_efl_container_content_set(Eo *obj, Elm_Panel_Data *sd, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
if (part)
|
if (part)
|
||||||
{
|
{
|
||||||
|
@ -923,7 +923,7 @@ _elm_panel_elm_container_content_set(Eo *obj, Elm_Panel_Data *sd, const char *pa
|
||||||
if (strcmp(part, "default"))
|
if (strcmp(part, "default"))
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_TRUE;
|
Eina_Bool int_ret = EINA_TRUE;
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
return int_ret;
|
return int_ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -946,7 +946,7 @@ _elm_panel_elm_container_content_set(Eo *obj, Elm_Panel_Data *sd, const char *pa
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_panel_elm_container_content_get(Eo *obj, Elm_Panel_Data *sd, const char *part)
|
_elm_panel_efl_container_content_get(Eo *obj, Elm_Panel_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
if (part)
|
if (part)
|
||||||
{
|
{
|
||||||
|
@ -959,7 +959,7 @@ _elm_panel_elm_container_content_get(Eo *obj, Elm_Panel_Data *sd, const char *pa
|
||||||
if (strcmp(part, "default"))
|
if (strcmp(part, "default"))
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), part);
|
ret = efl_content_get(eo_super(obj, MY_CLASS), part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -968,7 +968,7 @@ _elm_panel_elm_container_content_get(Eo *obj, Elm_Panel_Data *sd, const char *pa
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *part)
|
_elm_panel_efl_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
|
|
||||||
|
@ -982,7 +982,7 @@ _elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *
|
||||||
}
|
}
|
||||||
if (strcmp(part, "default"))
|
if (strcmp(part, "default"))
|
||||||
{
|
{
|
||||||
ret = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
|
ret = efl_content_unset(eo_super(obj, MY_CLASS), part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1039,7 +1039,7 @@ _elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv)
|
||||||
|
|
||||||
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
|
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
|
||||||
evas_object_size_hint_min_set(priv->event, minw, minh);
|
evas_object_size_hint_min_set(priv->event, minw, minh);
|
||||||
elm_obj_container_content_set(eo_super(obj, MY_CLASS), "elm.swallow.event", priv->event);
|
efl_content_set(eo_super(obj, MY_CLASS), "elm.swallow.event", priv->event);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -79,9 +79,9 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
|
||||||
Elm.Widget.access;
|
Elm.Widget.access;
|
||||||
Elm.Widget.event;
|
Elm.Widget.event;
|
||||||
Elm.Widget.on_focus_region;
|
Elm.Widget.on_focus_region;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
|
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ class Elm.Player (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
|
||||||
Evas.Object_Smart.del;
|
Evas.Object_Smart.del;
|
||||||
Elm.Widget.theme_apply;
|
Elm.Widget.theme_apply;
|
||||||
Elm.Widget.event;
|
Elm.Widget.event;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
|
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
|
||||||
}
|
}
|
||||||
|
|
|
@ -177,9 +177,9 @@ class Elm.Popup (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
|
||||||
Elm.Widget.translate;
|
Elm.Widget.translate;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Widget.event;
|
Elm.Widget.event;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Layout.text.set;
|
Elm.Layout.text.set;
|
||||||
Elm.Layout.text.get;
|
Elm.Layout.text.get;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
|
|
|
@ -174,10 +174,10 @@ _elm_progressbar_elm_widget_sub_object_del(Eo *obj, Elm_Progressbar_Data *_pd EI
|
||||||
* spot is elm.swallow.content, not elm.swallow.icon. Fix that
|
* spot is elm.swallow.content, not elm.swallow.icon. Fix that
|
||||||
* whenever we can changed the theme API */
|
* whenever we can changed the theme API */
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_progressbar_elm_container_content_set(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
_elm_progressbar_efl_container_content_set(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_FALSE;
|
Eina_Bool int_ret = EINA_FALSE;
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
if (!int_ret) return EINA_FALSE;
|
if (!int_ret) return EINA_FALSE;
|
||||||
|
|
||||||
_icon_signal_emit(obj);
|
_icon_signal_emit(obj);
|
||||||
|
|
|
@ -61,7 +61,7 @@ class Elm.Progressbar (Elm.Layout, Efl.Ui.Progress,
|
||||||
Elm.Widget.focus_next_manager_is;
|
Elm.Widget.focus_next_manager_is;
|
||||||
Elm.Widget.focus_direction_manager_is;
|
Elm.Widget.focus_direction_manager_is;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Layout.text_aliases.get;
|
Elm.Layout.text_aliases.get;
|
||||||
Elm.Layout.content_aliases.get;
|
Elm.Layout.content_aliases.get;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
|
|
|
@ -758,12 +758,12 @@ _loop_content_set(Evas_Object *obj, Elm_Scroller_Data *sd, Evas_Object *content)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_elm_scroller_elm_container_content_set(Eo *obj, Elm_Scroller_Data *sd, const char *part, Evas_Object *content)
|
_elm_scroller_efl_container_content_set(Eo *obj, Elm_Scroller_Data *sd, const char *part, Evas_Object *content)
|
||||||
{
|
{
|
||||||
if (part && strcmp(part, "default"))
|
if (part && strcmp(part, "default"))
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_FALSE;
|
Eina_Bool int_ret = EINA_FALSE;
|
||||||
int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
|
int_ret = efl_content_set(eo_super(obj, MY_CLASS), part, content);
|
||||||
return int_ret;
|
return int_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -803,12 +803,12 @@ _elm_scroller_elm_container_content_set(Eo *obj, Elm_Scroller_Data *sd, const ch
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_scroller_elm_container_content_get(Eo *obj, Elm_Scroller_Data *sd, const char *part)
|
_elm_scroller_efl_container_content_get(Eo *obj, Elm_Scroller_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
if (part && strcmp(part, "default"))
|
if (part && strcmp(part, "default"))
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), part);
|
ret = efl_content_get(eo_super(obj, MY_CLASS), part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -816,12 +816,12 @@ _elm_scroller_elm_container_content_get(Eo *obj, Elm_Scroller_Data *sd, const ch
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
_elm_scroller_elm_container_content_unset(Eo *obj, Elm_Scroller_Data *sd, const char *part)
|
_elm_scroller_efl_container_content_unset(Eo *obj, Elm_Scroller_Data *sd, const char *part)
|
||||||
{
|
{
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
if (part && strcmp(part, "default"))
|
if (part && strcmp(part, "default"))
|
||||||
{
|
{
|
||||||
ret = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
|
ret = efl_content_unset(eo_super(obj, MY_CLASS), part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -70,9 +70,9 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
|
||||||
Elm.Widget.focus_direction;
|
Elm.Widget.focus_direction;
|
||||||
Elm.Widget.sub_object_del;
|
Elm.Widget.sub_object_del;
|
||||||
Elm.Widget.event;
|
Elm.Widget.event;
|
||||||
Elm.Container.content.get;
|
Efl.Container.content.get;
|
||||||
Elm.Container.content.set;
|
Efl.Container.content.set;
|
||||||
Elm.Container.content_unset;
|
Efl.Container.content_unset;
|
||||||
Elm.Layout.sizing_eval;
|
Elm.Layout.sizing_eval;
|
||||||
Elm.Interface_Scrollable.page_size.set;
|
Elm.Interface_Scrollable.page_size.set;
|
||||||
Elm.Interface_Scrollable.policy.set;
|
Elm.Interface_Scrollable.policy.set;
|
||||||
|
|
|
@ -1714,7 +1714,7 @@ _elm_toolbar_item_elm_widget_item_part_content_set(Eo *eo_item EINA_UNUSED, Elm_
|
||||||
|
|
||||||
if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
|
if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
|
||||||
{
|
{
|
||||||
elm_obj_container_content_set(VIEW(item), part, content);
|
efl_content_set(VIEW(item), part, content);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (item->object == content) return;
|
if (item->object == content) return;
|
||||||
|
@ -1737,7 +1737,7 @@ _elm_toolbar_item_elm_widget_item_part_content_get(Eo *eo_it EINA_UNUSED, Elm_To
|
||||||
|
|
||||||
if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
|
if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
|
||||||
{
|
{
|
||||||
content = elm_obj_container_content_get(VIEW(it), part);
|
content = efl_content_get(VIEW(it), part);
|
||||||
if (content) return content;
|
if (content) return content;
|
||||||
else return NULL;
|
else return NULL;
|
||||||
}
|
}
|
||||||
|
@ -1756,7 +1756,7 @@ _elm_toolbar_item_elm_widget_item_part_content_unset(Eo *eo_item EINA_UNUSED, El
|
||||||
|
|
||||||
if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
|
if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
|
||||||
{
|
{
|
||||||
o = elm_obj_container_content_unset(VIEW(item), part);
|
o = efl_content_unset(VIEW(item), part);
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3657,7 +3657,7 @@ elm_widget_content_part_set(Evas_Object *obj,
|
||||||
Evas_Object *content)
|
Evas_Object *content)
|
||||||
{
|
{
|
||||||
ELM_WIDGET_CHECK(obj);
|
ELM_WIDGET_CHECK(obj);
|
||||||
elm_obj_container_content_set(obj, part, content);
|
efl_content_set(obj, part, content);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Object *
|
EAPI Evas_Object *
|
||||||
|
@ -3666,7 +3666,7 @@ elm_widget_content_part_get(const Evas_Object *obj,
|
||||||
{
|
{
|
||||||
ELM_WIDGET_CHECK(obj) NULL;
|
ELM_WIDGET_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_get((Eo *) obj, part);
|
ret = efl_content_get((Eo *) obj, part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3676,7 +3676,7 @@ elm_widget_content_part_unset(Evas_Object *obj,
|
||||||
{
|
{
|
||||||
ELM_WIDGET_CHECK(obj) NULL;
|
ELM_WIDGET_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
Evas_Object *ret = NULL;
|
||||||
ret = elm_obj_container_content_unset(obj, part);
|
ret = efl_content_unset(obj, part);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,8 +36,6 @@
|
||||||
* - elm_object_part_content_unset()
|
* - elm_object_part_content_unset()
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "elm_container.eo.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @}
|
* @}
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -38,17 +38,17 @@ START_TEST(elm_layout_swallows)
|
||||||
evas_object_show(ly);
|
evas_object_show(ly);
|
||||||
|
|
||||||
bt = eo_add(ELM_BUTTON_CLASS, ly);
|
bt = eo_add(ELM_BUTTON_CLASS, ly);
|
||||||
fail_if(!elm_obj_container_content_set(ly, "element1", bt));
|
fail_if(!efl_content_set(ly, "element1", bt));
|
||||||
ck_assert_ptr_eq(eo_parent_get(bt), ly);
|
ck_assert_ptr_eq(eo_parent_get(bt), ly);
|
||||||
|
|
||||||
bt = elm_obj_container_content_unset(ly, "element1");
|
bt = efl_content_unset(ly, "element1");
|
||||||
ck_assert_ptr_eq(eo_parent_get(bt), evas_common_evas_get(bt));
|
ck_assert_ptr_eq(eo_parent_get(bt), evas_common_evas_get(bt));
|
||||||
|
|
||||||
fail_if(!elm_obj_container_content_set(ly, "element1", bt));
|
fail_if(!efl_content_set(ly, "element1", bt));
|
||||||
ck_assert_ptr_eq(eo_parent_get(bt), ly);
|
ck_assert_ptr_eq(eo_parent_get(bt), ly);
|
||||||
|
|
||||||
bt2 = eo_add(ELM_BUTTON_CLASS, ly);
|
bt2 = eo_add(ELM_BUTTON_CLASS, ly);
|
||||||
fail_if(!elm_obj_container_content_set(ly, "element1", bt2));
|
fail_if(!efl_content_set(ly, "element1", bt2));
|
||||||
ck_assert_ptr_eq(eo_parent_get(bt2), ly);
|
ck_assert_ptr_eq(eo_parent_get(bt2), ly);
|
||||||
/* bt is deleted at this point. */
|
/* bt is deleted at this point. */
|
||||||
ck_assert_ptr_eq(eo_parent_get(bt), evas_common_evas_get(bt));
|
ck_assert_ptr_eq(eo_parent_get(bt), evas_common_evas_get(bt));
|
||||||
|
|
Loading…
Reference in New Issue