diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c index 34792f3832..c9ec2d6222 100644 --- a/src/bin/elementary/test_ui_pager.c +++ b/src/bin/elementary/test_ui_pager.c @@ -316,7 +316,7 @@ static void indicator_icon_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) { Params *params = data; - params->indicator = efl_add(EFL_PAGE_INDICATOR_ICON_CLASS, params->pager); + params->indicator = efl_add(EFL_PAGE_ICON_INDICATOR_CLASS, params->pager); efl_ui_pager_indicator_set(params->pager, params->indicator); } diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c index c60ac486b2..7c1211e31b 100644 --- a/src/bin/elementary/test_ui_pager_scroll.c +++ b/src/bin/elementary/test_ui_pager_scroll.c @@ -369,7 +369,7 @@ static void indicator_icon_btn_cb(void *data, { Params *params = data; - params->indicator = efl_add(EFL_PAGE_INDICATOR_ICON_CLASS, params->pager); + params->indicator = efl_add(EFL_PAGE_ICON_INDICATOR_CLASS, params->pager); efl_ui_pager_indicator_set(params->pager, params->indicator); } diff --git a/src/bin/elementary/test_ui_spotlight.c b/src/bin/elementary/test_ui_spotlight.c index f38dfca754..cf52bb750a 100644 --- a/src/bin/elementary/test_ui_spotlight.c +++ b/src/bin/elementary/test_ui_spotlight.c @@ -396,7 +396,7 @@ indicator_icon_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) { Params *params = data; - params->indicator = efl_new(EFL_UI_SPOTLIGHT_INDICATOR_ICON_CLASS); + params->indicator = efl_new(EFL_UI_SPOTLIGHT_ICON_INDICATOR_CLASS); efl_ui_spotlight_indicator_set(params->spotlight, params->indicator); } diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c index 62e4e7df09..2500b4d484 100644 --- a/src/bin/elementary/test_ui_tab_pager.c +++ b/src/bin/elementary/test_ui_tab_pager.c @@ -527,14 +527,14 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) static void _tran_set_btn_scroll_cb(void *data, const Efl_Event *ev EINA_UNUSED) { - Efl_Ui_Spotlight_Manager_Scroll *scroll = efl_new(EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS); + Efl_Ui_Spotlight_Scroll_Manager *scroll = efl_new(EFL_UI_SPOTLIGHT_SCROLL_MANAGER_CLASS); efl_ui_spotlight_manager_set(data, scroll); } static void _tran_set_btn_stack_cb(void *data, const Efl_Event *ev EINA_UNUSED) { - Efl_Ui_Spotlight_Manager_Scroll *stack = efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS); + Efl_Ui_Spotlight_Scroll_Manager *stack = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS); efl_ui_spotlight_manager_set(data, stack); } diff --git a/src/examples/elementary/efl_ui_slideshow_example.c b/src/examples/elementary/efl_ui_slideshow_example.c index 6292f4390f..f1429843d0 100644 --- a/src/examples/elementary/efl_ui_slideshow_example.c +++ b/src/examples/elementary/efl_ui_slideshow_example.c @@ -93,8 +93,8 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) container = efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, win, efl_event_callback_add(efl_added, EFL_UI_SPOTLIGHT_EVENT_TRANSITION_END, _container_end, NULL), efl_pack_table(table, efl_added, 0, 0, 1, 1)); - efl_ui_spotlight_indicator_set(container, efl_new(EFL_UI_SPOTLIGHT_INDICATOR_ICON_CLASS)); - efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS)); + efl_ui_spotlight_indicator_set(container, efl_new(EFL_UI_SPOTLIGHT_ICON_INDICATOR_CLASS)); + efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS)); for (int i = 0; i < IMG_NUM; i++) { diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index 4ec831f2a2..64497913db 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -266,9 +266,9 @@ typedef Eo Efl_Ui_Spotlight_Indicator; # include # include # include -# include -# include -# include +# include +# include +# include # include # include # include diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c index 8ac5a429cc..33ab9bf9bd 100644 --- a/src/lib/elementary/efl_ui_pager.c +++ b/src/lib/elementary/efl_ui_pager.c @@ -18,7 +18,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj, Efl_Ui_Pager_Data *sd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); - scroller = efl_new(EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS); + scroller = efl_new(EFL_UI_SPOTLIGHT_SCROLL_MANAGER_CLASS); efl_ui_spotlight_manager_set(obj, scroller); return obj; diff --git a/src/lib/elementary/efl_ui_spotlight_container.c b/src/lib/elementary/efl_ui_spotlight_container.c index a5f3c9e390..1bc3c25f8f 100644 --- a/src/lib/elementary/efl_ui_spotlight_container.c +++ b/src/lib/elementary/efl_ui_spotlight_container.c @@ -4,7 +4,7 @@ #include #include "elm_priv.h" -#include "efl_ui_spotlight_manager_plain.eo.h" +#include "efl_ui_spotlight_plain_manager.eo.h" typedef struct _Efl_Ui_Spotlight_Container_Data { @@ -236,7 +236,7 @@ _efl_ui_spotlight_container_efl_object_finalize(Eo *obj, Efl_Ui_Spotlight_Contai //set a view manager in case nothing is here if (!manager) { - efl_ui_spotlight_manager_set(obj, efl_new(EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS)); + efl_ui_spotlight_manager_set(obj, efl_new(EFL_UI_SPOTLIGHT_PLAIN_MANAGER_CLASS)); } else { @@ -648,7 +648,7 @@ EOLIAN static void _efl_ui_spotlight_container_spotlight_manager_set(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd, Efl_Ui_Spotlight_Manager *transition) { if (!transition) - pd->transition = efl_add(EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS, obj); + pd->transition = efl_add(EFL_UI_SPOTLIGHT_PLAIN_MANAGER_CLASS, obj); else EINA_SAFETY_ON_FALSE_RETURN(efl_isa(transition, EFL_UI_SPOTLIGHT_MANAGER_CLASS)); @@ -679,7 +679,7 @@ _efl_ui_spotlight_container_spotlight_manager_set(Eo *obj, Efl_Ui_Spotlight_Cont EOLIAN static Efl_Ui_Spotlight_Manager* _efl_ui_spotlight_container_spotlight_manager_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd) { - if (efl_isa(pd->transition, EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS)) + if (efl_isa(pd->transition, EFL_UI_SPOTLIGHT_PLAIN_MANAGER_CLASS)) return NULL; else return pd->transition; diff --git a/src/lib/elementary/efl_ui_spotlight_indicator_icon.c b/src/lib/elementary/efl_ui_spotlight_icon_indicator.c similarity index 82% rename from src/lib/elementary/efl_ui_spotlight_indicator_icon.c rename to src/lib/elementary/efl_ui_spotlight_icon_indicator.c index 4ac177580d..731a9a9429 100644 --- a/src/lib/elementary/efl_ui_spotlight_indicator_icon.c +++ b/src/lib/elementary/efl_ui_spotlight_icon_indicator.c @@ -13,7 +13,7 @@ typedef struct { Efl_Canvas_Layout *layout; double last_position; Eina_Size2D min, max; -} Efl_Ui_Spotlight_Indicator_Icon_Data; +} Efl_Ui_Spotlight_Icon_Indicator_Data; static void _flush_state(Eo *item, double val) @@ -24,7 +24,7 @@ _flush_state(Eo *item, double val) } static void -_add_item(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd) +_add_item(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Icon_Indicator_Data *pd) { Efl_Canvas_Layout *item; @@ -40,7 +40,7 @@ _add_item(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd) } static void -_flush_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd) +_flush_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Icon_Indicator_Data *pd) { int next = -1, closer; double closer_val; @@ -91,7 +91,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(spotlight_resized, ) EOLIAN static void -_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_bind(Eo *obj, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, Efl_Ui_Spotlight_Container *spotlight) +_efl_ui_spotlight_icon_indicator_efl_ui_spotlight_indicator_bind(Eo *obj, Efl_Ui_Spotlight_Icon_Indicator_Data *pd, Efl_Ui_Spotlight_Container *spotlight) { if (spotlight) { @@ -122,7 +122,7 @@ _efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_bind(Eo *obj, Efl_Ui } EOLIAN static void -_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_content_add(Eo *obj, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED) +_efl_ui_spotlight_icon_indicator_efl_ui_spotlight_indicator_content_add(Eo *obj, Efl_Ui_Spotlight_Icon_Indicator_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED) { _add_item(obj, pd); _flush_position(obj, pd); @@ -130,29 +130,29 @@ _efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_content_add(Eo *obj, } EOLIAN static void -_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_content_del(Eo *obj, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED) +_efl_ui_spotlight_icon_indicator_efl_ui_spotlight_indicator_content_del(Eo *obj, Efl_Ui_Spotlight_Icon_Indicator_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED) { efl_del(efl_pack_content_get(pd->indicator, 0)); _flush_position(obj, pd); } EOLIAN static void -_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_position_update(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, double position) +_efl_ui_spotlight_icon_indicator_efl_ui_spotlight_indicator_position_update(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Icon_Indicator_Data *pd, double position) { pd->last_position = position; _flush_position(obj, pd); } EOLIAN static void -_efl_ui_spotlight_indicator_icon_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd) +_efl_ui_spotlight_icon_indicator_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Icon_Indicator_Data *pd) { if (pd->layout) efl_del(pd->layout); if (pd->indicator) efl_del(pd->indicator); - efl_destructor(efl_super(obj, EFL_UI_SPOTLIGHT_INDICATOR_ICON_CLASS)); + efl_destructor(efl_super(obj, EFL_UI_SPOTLIGHT_ICON_INDICATOR_CLASS)); } -#include "efl_ui_spotlight_indicator_icon.eo.c" +#include "efl_ui_spotlight_icon_indicator.eo.c" diff --git a/src/lib/elementary/efl_ui_spotlight_indicator_icon.eo b/src/lib/elementary/efl_ui_spotlight_icon_indicator.eo similarity index 69% rename from src/lib/elementary/efl_ui_spotlight_indicator_icon.eo rename to src/lib/elementary/efl_ui_spotlight_icon_indicator.eo index de1d689d74..63ef0554fd 100644 --- a/src/lib/elementary/efl_ui_spotlight_indicator_icon.eo +++ b/src/lib/elementary/efl_ui_spotlight_icon_indicator.eo @@ -1,4 +1,5 @@ -class @beta Efl.Ui.Spotlight.Indicator_Icon extends Efl.Ui.Spotlight.Indicator { +class @beta Efl.Ui.Spotlight.Icon_Indicator extends Efl.Ui.Spotlight.Indicator { + c_prefix: efl_ui_spotlight_indicator_icon; implements { Efl.Ui.Spotlight.Indicator.bind; Efl.Ui.Spotlight.Indicator.content_del; diff --git a/src/lib/elementary/efl_ui_spotlight_manager_plain.c b/src/lib/elementary/efl_ui_spotlight_plain_manager.c similarity index 73% rename from src/lib/elementary/efl_ui_spotlight_manager_plain.c rename to src/lib/elementary/efl_ui_spotlight_plain_manager.c index 81c954e62f..d120ef8f11 100644 --- a/src/lib/elementary/efl_ui_spotlight_manager_plain.c +++ b/src/lib/elementary/efl_ui_spotlight_plain_manager.c @@ -4,7 +4,7 @@ #include #include "elm_priv.h" -#include "efl_ui_spotlight_manager_plain.eo.h" +#include "efl_ui_spotlight_plain_manager.eo.h" typedef struct { Efl_Ui_Spotlight_Container * container; @@ -13,12 +13,12 @@ typedef struct { Efl_Gfx_Entity *clipper; Eina_Bool animation; double last_pos; -} Efl_Ui_Spotlight_Manager_Plain_Data; +} Efl_Ui_Spotlight_Plain_Manager_Data; -#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS +#define MY_CLASS EFL_UI_SPOTLIGHT_PLAIN_MANAGER_CLASS static void -_emit_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd) +_emit_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Plain_Manager_Data *pd) { double absolut_position = efl_pack_index_get(pd->container, pd->current_content); if (pd->last_pos != absolut_position) @@ -28,7 +28,7 @@ _emit_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd) } static void -_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd) +_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Plain_Manager_Data *pd) { Efl_Gfx_Entity *entity = pd->current_content; Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container); @@ -42,7 +42,7 @@ _geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd) } EOLIAN static void -_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Efl_Ui_Spotlight_Container *spotlight) +_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight) { if (spotlight) { @@ -74,7 +74,7 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Sp } static void -_content_changed(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd) +_content_changed(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd) { if (efl_ui_spotlight_active_element_get(pd->container) != pd->current_content) { @@ -88,7 +88,7 @@ _content_changed(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd) } EOLIAN static void -_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_content_add(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) +_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_content_add(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) { efl_key_data_set(subobj, "_elm_leaveme", pd->container); efl_canvas_object_clipper_set(subobj, pd->clipper); @@ -98,7 +98,7 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_content_add(Eo *obj, Ef } EOLIAN static void -_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_content_del(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) +_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_content_del(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) { efl_key_data_set(subobj, "_elm_leaveme", NULL); efl_canvas_object_clipper_set(subobj, NULL); @@ -108,7 +108,7 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_content_del(Eo *obj, Ef _content_changed(obj, pd); } EOLIAN static void -_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, int from EINA_UNUSED, int to) +_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, int from EINA_UNUSED, int to) { Efl_Gfx_Entity *to_obj, *from_obj; to_obj = efl_pack_content_get(pd->container, to); @@ -130,14 +130,14 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_ } EOLIAN static void -_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Eina_Size2D size) +_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Eina_Size2D size) { pd->page_size = size; _geom_sync(obj, pd); } EOLIAN static void -_efl_ui_spotlight_manager_plain_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd EINA_UNUSED) +_efl_ui_spotlight_plain_manager_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd EINA_UNUSED) { efl_destructor(efl_super(obj, MY_CLASS)); @@ -149,19 +149,19 @@ _efl_ui_spotlight_manager_plain_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_ } EOLIAN static void -_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Eina_Bool animation) +_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Eina_Bool animation) { pd->animation = animation; } EOLIAN static Eina_Bool -_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd) +_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Plain_Manager_Data *pd) { return pd->animation; } EOLIAN static void -_efl_ui_spotlight_manager_plain_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd) +_efl_ui_spotlight_plain_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd) { efl_del(pd->clipper); @@ -173,4 +173,4 @@ _efl_ui_spotlight_manager_plain_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_ efl_invalidate(efl_super(obj, MY_CLASS)); } -#include "efl_ui_spotlight_manager_plain.eo.c" +#include "efl_ui_spotlight_plain_manager.eo.c" diff --git a/src/lib/elementary/efl_ui_spotlight_manager_plain.eo b/src/lib/elementary/efl_ui_spotlight_plain_manager.eo similarity index 77% rename from src/lib/elementary/efl_ui_spotlight_manager_plain.eo rename to src/lib/elementary/efl_ui_spotlight_plain_manager.eo index 23bf0e443e..95464305ec 100644 --- a/src/lib/elementary/efl_ui_spotlight_manager_plain.eo +++ b/src/lib/elementary/efl_ui_spotlight_plain_manager.eo @@ -1,5 +1,6 @@ -class @beta Efl.Ui.Spotlight.Manager_Plain extends Efl.Ui.Spotlight.Manager +class @beta Efl.Ui.Spotlight.Plain_Manager extends Efl.Ui.Spotlight.Manager { + c_prefix: efl_ui_spotlight_manager_plain; implements { Efl.Ui.Spotlight.Manager.bind; Efl.Ui.Spotlight.Manager.content_add; diff --git a/src/lib/elementary/efl_ui_spotlight_manager_scroll.c b/src/lib/elementary/efl_ui_spotlight_scroll_manager.c similarity index 85% rename from src/lib/elementary/efl_ui_spotlight_manager_scroll.c rename to src/lib/elementary/efl_ui_spotlight_scroll_manager.c index 267b64471b..bdb6840c06 100644 --- a/src/lib/elementary/efl_ui_spotlight_manager_scroll.c +++ b/src/lib/elementary/efl_ui_spotlight_scroll_manager.c @@ -24,9 +24,9 @@ typedef struct { } mouse_move; Eina_Bool animation; Eina_Bool scroll_block; -} Efl_Ui_Spotlight_Manager_Scroll_Data; +} Efl_Ui_Spotlight_Scroll_Manager_Data; -#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS +#define MY_CLASS EFL_UI_SPOTLIGHT_SCROLL_MANAGER_CLASS static void _page_set_animation(void *data, const Efl_Event *event); @@ -37,7 +37,7 @@ _propagate_progress(Eo *obj, double pos) } static void -_apply_box_properties(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd) +_apply_box_properties(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd) { Eina_Rect geometry = EINA_RECT_EMPTY(); Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container); @@ -84,7 +84,7 @@ _mouse_down_cb(void *data, { Efl_Input_Pointer *ev = event->info; Eo *obj = data; - Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); + Efl_Ui_Spotlight_Scroll_Manager_Data *pd = efl_data_scope_get(obj, MY_CLASS); if (efl_input_pointer_button_get(ev) != 1) return; if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return; @@ -110,7 +110,7 @@ _mouse_move_cb(void *data, { Efl_Input_Pointer *ev = event->info; Eo *obj = data; - Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); + Efl_Ui_Spotlight_Scroll_Manager_Data *pd = efl_data_scope_get(obj, MY_CLASS); Eina_Position2D pos; int pos_y_diff; @@ -139,7 +139,7 @@ _mouse_up_cb(void *data, { Efl_Input_Pointer *ev = event->info; Eo *obj = data; - Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); + Efl_Ui_Spotlight_Scroll_Manager_Data *pd = efl_data_scope_get(obj, MY_CLASS); if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return; if (!pd->mouse_move.active) return; @@ -159,7 +159,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(mouse_listeners, ); EOLIAN static void -_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Efl_Ui_Spotlight_Container *spotlight) +_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight) { if (spotlight) { @@ -196,7 +196,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_S } EOLIAN static void -_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) +_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) { efl_key_data_set(subobj, "_elm_leaveme", pd->container); efl_gfx_entity_visible_set(subobj, EINA_TRUE); @@ -209,7 +209,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_content_add(Eo *obj EI EOLIAN static void -_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) +_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) { efl_key_data_set(subobj, "_elm_leaveme", NULL); efl_canvas_object_clipper_set(subobj, NULL); @@ -222,7 +222,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_content_del(Eo *obj EI static void _page_set_animation(void *data, const Efl_Event *event EINA_UNUSED) { - Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(data, MY_CLASS); + Efl_Ui_Spotlight_Scroll_Manager_Data *pd = efl_data_scope_get(data, MY_CLASS); double p = (ecore_loop_time_get() - pd->transition.start_time) / pd->transition.max_time; if (p >= 1.0) p = 1.0; @@ -241,7 +241,7 @@ _page_set_animation(void *data, const Efl_Event *event EINA_UNUSED) } static void -_animation_request_switch(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, int from, int to) +_animation_request_switch(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, int from, int to) { //if there is already a transition ongoing, which is no mouse transition, but goes to the same position, then do nothing if (pd->transition.active && !pd->mouse_move.active && pd->transition.to == to) @@ -276,7 +276,7 @@ _animation_request_switch(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, int } EOLIAN static void -_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, int from, int to) +_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, int from, int to) { if (pd->animation) { @@ -292,7 +292,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl } EOLIAN static void -_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Eina_Size2D size) +_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Eina_Size2D size) { pd->page_size = size; if (!pd->transition.active) @@ -300,7 +300,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_size_set(Eo *obj EINA_ } EOLIAN static void -_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Eina_Bool animation) +_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Eina_Bool animation) { pd->animation = animation; if (pd->transition.active && !animation) @@ -312,14 +312,14 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animated_transition_se } EOLIAN static Eina_Bool -_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd) +_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd) { return pd->animation; } EOLIAN static void -_efl_ui_spotlight_manager_scroll_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd EINA_UNUSED) +_efl_ui_spotlight_scroll_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd EINA_UNUSED) { efl_del(pd->event); efl_del(pd->backclip); @@ -334,7 +334,7 @@ _efl_ui_spotlight_manager_scroll_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight } EOLIAN static void -_efl_ui_spotlight_manager_scroll_scroll_block_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Eina_Bool scroll_block) +_efl_ui_spotlight_scroll_manager_scroll_block_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Eina_Bool scroll_block) { if (pd->scroll_block == scroll_block) return; @@ -349,9 +349,9 @@ _efl_ui_spotlight_manager_scroll_scroll_block_set(Eo *obj EINA_UNUSED, Efl_Ui_Sp } EOLIAN static Eina_Bool -_efl_ui_spotlight_manager_scroll_scroll_block_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd) +_efl_ui_spotlight_scroll_manager_scroll_block_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd) { return pd->scroll_block; } -#include "efl_ui_spotlight_manager_scroll.eo.c" +#include "efl_ui_spotlight_scroll_manager.eo.c" diff --git a/src/lib/elementary/efl_ui_spotlight_manager_scroll.eo b/src/lib/elementary/efl_ui_spotlight_scroll_manager.eo similarity index 86% rename from src/lib/elementary/efl_ui_spotlight_manager_scroll.eo rename to src/lib/elementary/efl_ui_spotlight_scroll_manager.eo index c9a8e7ad34..b7101035cd 100644 --- a/src/lib/elementary/efl_ui_spotlight_manager_scroll.eo +++ b/src/lib/elementary/efl_ui_spotlight_scroll_manager.eo @@ -1,5 +1,6 @@ -class @beta Efl.Ui.Spotlight.Manager_Scroll extends Efl.Ui.Spotlight.Manager +class @beta Efl.Ui.Spotlight.Scroll_Manager extends Efl.Ui.Spotlight.Manager { + c_prefix: efl_ui_spotlight_manager_scroll; methods { @property scroll_block { [[User scrolling forbidden. diff --git a/src/lib/elementary/efl_ui_spotlight_manager_stack.c b/src/lib/elementary/efl_ui_spotlight_stack_manager.c similarity index 81% rename from src/lib/elementary/efl_ui_spotlight_manager_stack.c rename to src/lib/elementary/efl_ui_spotlight_stack_manager.c index dccef97cdc..253a7259f4 100644 --- a/src/lib/elementary/efl_ui_spotlight_manager_stack.c +++ b/src/lib/elementary/efl_ui_spotlight_stack_manager.c @@ -14,12 +14,12 @@ typedef struct { int ids[2]; //only used when in animation Eina_Size2D page_size; Eina_Bool animation; -} Efl_Ui_Spotlight_Manager_Stack_Data; +} Efl_Ui_Spotlight_Stack_Manager_Data; -#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS +#define MY_CLASS EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS static void -_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd) +_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd) { Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container); Eina_Rect goal = EINA_RECT_EMPTY(); @@ -37,7 +37,7 @@ _geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd) static void _running_cb(void *data, const Efl_Event *ev EINA_UNUSED) { - Efl_Ui_Spotlight_Manager_Stack_Data *pd = efl_data_scope_safe_get(data, MY_CLASS); + Efl_Ui_Spotlight_Stack_Manager_Data *pd = efl_data_scope_safe_get(data, MY_CLASS); double absolut_position; EINA_SAFETY_ON_NULL_RETURN(pd); @@ -58,7 +58,7 @@ _hide_object_cb(void *data, const Efl_Event *ev) } EOLIAN static void -_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Efl_Ui_Spotlight_Container *spotlight) +_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight) { if (spotlight) { @@ -90,7 +90,7 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Sp } static void -_update_ids(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, int avoid_index) +_update_ids(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, int avoid_index) { for (int i = 0; i < 2; ++i) { @@ -102,7 +102,7 @@ _update_ids(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, int avoid_index) } EOLIAN static void -_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) +_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) { efl_key_data_set(subobj, "_elm_leaveme", pd->container); efl_canvas_object_clipper_set(subobj, pd->clipper); @@ -112,7 +112,7 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_content_add(Eo *obj EIN } EOLIAN static void -_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Efl_Gfx_Entity *subobj, int index) +_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index) { efl_key_data_set(subobj, "_elm_leaveme", NULL); efl_canvas_object_clipper_set(subobj, NULL); @@ -135,7 +135,7 @@ is_valid(Eo *obj, int index) } EOLIAN static void -_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, int from, int to) +_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, int from, int to) { if (efl_pack_content_get(pd->container, to) == pd->content[1]) return; @@ -175,14 +175,14 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_ } EOLIAN static void -_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Eina_Size2D size) +_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Eina_Size2D size) { pd->page_size = size; _geom_sync(obj, pd); } EOLIAN static void -_efl_ui_spotlight_manager_stack_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd) +_efl_ui_spotlight_stack_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd) { efl_invalidate(efl_super(obj, MY_CLASS)); @@ -201,7 +201,7 @@ _efl_ui_spotlight_manager_stack_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_ } EOLIAN static void -_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Eina_Bool animation) +_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Eina_Bool animation) { for (int i = 0; i < 2; ++i) { @@ -212,10 +212,10 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_animated_transition_set } EOLIAN static Eina_Bool -_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd) +_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd) { return pd->animation; } -#include "efl_ui_spotlight_manager_stack.eo.c" +#include "efl_ui_spotlight_stack_manager.eo.c" diff --git a/src/lib/elementary/efl_ui_spotlight_manager_stack.eo b/src/lib/elementary/efl_ui_spotlight_stack_manager.eo similarity index 75% rename from src/lib/elementary/efl_ui_spotlight_manager_stack.eo rename to src/lib/elementary/efl_ui_spotlight_stack_manager.eo index 2275eb8ff0..6ee2f5acfa 100644 --- a/src/lib/elementary/efl_ui_spotlight_manager_stack.eo +++ b/src/lib/elementary/efl_ui_spotlight_stack_manager.eo @@ -1,5 +1,6 @@ -class @beta Efl.Ui.Spotlight.Manager_Stack extends Efl.Ui.Spotlight.Manager +class @beta Efl.Ui.Spotlight.Stack_Manager extends Efl.Ui.Spotlight.Manager { + c_prefix: efl_ui_spotlight_manager_stack; implements { Efl.Ui.Spotlight.Manager.bind; Efl.Ui.Spotlight.Manager.content_add; diff --git a/src/lib/elementary/efl_ui_spotlight_util.c b/src/lib/elementary/efl_ui_spotlight_util.c index c49ebd4d8c..35a8e8e7d6 100644 --- a/src/lib/elementary/efl_ui_spotlight_util.c +++ b/src/lib/elementary/efl_ui_spotlight_util.c @@ -12,7 +12,7 @@ typedef struct { EOLIAN static Efl_Ui_Spotlight_Container* _efl_ui_spotlight_util_stack_gen(Efl_Ui_Widget *parent) { - Efl_Ui_Spotlight_Manager *manager = efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS); + Efl_Ui_Spotlight_Manager *manager = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS); return efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, parent, efl_ui_spotlight_manager_set(efl_added, manager)); } diff --git a/src/lib/elementary/efl_ui_stack.c b/src/lib/elementary/efl_ui_stack.c index e1769b7603..66c27b76d7 100644 --- a/src/lib/elementary/efl_ui_stack.c +++ b/src/lib/elementary/efl_ui_stack.c @@ -18,7 +18,7 @@ _efl_ui_stack_efl_object_constructor(Eo *obj, Efl_Ui_Stack_Data *sd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); - stack = efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS); + stack = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS); efl_ui_spotlight_manager_set(obj, stack); return obj; diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 6606f084de..8dc190097f 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -146,10 +146,10 @@ pub_eo_files = [ 'efl_ui_focus_manager_window_root.eo', 'efl_ui_spotlight_container.eo', 'efl_ui_spotlight_manager.eo', - 'efl_ui_spotlight_manager_scroll.eo', - 'efl_ui_spotlight_manager_stack.eo', + 'efl_ui_spotlight_scroll_manager.eo', + 'efl_ui_spotlight_stack_manager.eo', 'efl_ui_spotlight_indicator.eo', - 'efl_ui_spotlight_indicator_icon.eo', + 'efl_ui_spotlight_icon_indicator.eo', 'efl_ui_spotlight_util.eo', 'efl_ui_tab_pager.eo', 'efl_ui_tab_bar.eo', @@ -241,7 +241,7 @@ priv_eo_files = [ 'efl_ui_homogeneous_model.eo', 'efl_ui_exact_model.eo', 'efl_ui_average_model.eo', - 'efl_ui_spotlight_manager_plain.eo', + 'efl_ui_spotlight_plain_manager.eo', 'efl_ui_collection_focus_manager.eo', ] @@ -915,11 +915,11 @@ elementary_src = [ 'elm_focus_legacy.c', 'efl_ui_spotlight_container.c', 'efl_ui_spotlight_manager.c', - 'efl_ui_spotlight_manager_plain.c', - 'efl_ui_spotlight_manager_scroll.c', - 'efl_ui_spotlight_manager_stack.c', + 'efl_ui_spotlight_plain_manager.c', + 'efl_ui_spotlight_scroll_manager.c', + 'efl_ui_spotlight_stack_manager.c', 'efl_ui_spotlight_indicator.c', - 'efl_ui_spotlight_indicator_icon.c', + 'efl_ui_spotlight_icon_indicator.c', 'efl_ui_spotlight_util.c', 'efl_ui_focus_graph.h', 'efl_ui_focus_graph.c', diff --git a/src/tests/elementary/efl_ui_test_spotlight.c b/src/tests/elementary/efl_ui_test_spotlight.c index f4e39ffdf0..eada2839c9 100644 --- a/src/tests/elementary/efl_ui_test_spotlight.c +++ b/src/tests/elementary/efl_ui_test_spotlight.c @@ -645,7 +645,7 @@ EFL_START_TEST (efl_ui_spotlight_animated_transition) ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_FALSE); //now check with a real spotlight manager - efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS)); + efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS)); efl_ui_spotlight_animated_transition_set(container, EINA_TRUE); ck_assert_int_eq(efl_ui_spotlight_animated_transition_get(container), EINA_TRUE); ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_TRUE); @@ -654,7 +654,7 @@ EFL_START_TEST (efl_ui_spotlight_animated_transition) ck_assert_int_eq(efl_ui_spotlight_animated_transition_get(container), EINA_FALSE); ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_FALSE); - Eo *manager2 = efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS); + Eo *manager2 = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS); Eina_Bool animated_transition_manager; efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, win, efl_ui_spotlight_manager_set(efl_added, manager2),