forked from enlightenment/efl
efl_ui_spotlight: rename Stack_Manager to Fade_Manager
Summary: Since Stack_Manager displays fade in/out transition effects, the class name is renamed from Stack_Manager to Fade_Manager. Depends on D11142 Reviewers: segfaultxavi, bu5hm4n, zmike Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11143
This commit is contained in:
parent
3e21d34349
commit
09e3972d14
|
@ -534,7 +534,7 @@ _tran_set_btn_scroll_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
|||
static void
|
||||
_tran_set_btn_stack_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
Efl_Ui_Spotlight_Scroll_Manager *stack = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS);
|
||||
Efl_Ui_Spotlight_Scroll_Manager *stack = efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS);
|
||||
efl_ui_spotlight_manager_set(data, stack);
|
||||
}
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
|
|||
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_ICON_INDICATOR_CLASS));
|
||||
efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS));
|
||||
efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS));
|
||||
|
||||
for (int i = 0; i < IMG_NUM; i++)
|
||||
{
|
||||
|
|
|
@ -268,7 +268,7 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
|
|||
# include <efl_ui_spotlight_indicator.eo.h>
|
||||
# include <efl_ui_spotlight_icon_indicator.eo.h>
|
||||
# include <efl_ui_spotlight_scroll_manager.eo.h>
|
||||
# include <efl_ui_spotlight_stack_manager.eo.h>
|
||||
# include <efl_ui_spotlight_fade_manager.eo.h>
|
||||
# include <efl_ui_spotlight_util.eo.h>
|
||||
# include <efl_ui_stack.eo.h>
|
||||
# include <efl_ui_pager.eo.h>
|
||||
|
|
|
@ -14,12 +14,12 @@ typedef struct {
|
|||
int ids[2]; //only used when in animation
|
||||
Eina_Size2D page_size;
|
||||
Eina_Bool animation;
|
||||
} Efl_Ui_Spotlight_Stack_Manager_Data;
|
||||
} Efl_Ui_Spotlight_Fade_Manager_Data;
|
||||
|
||||
#define MY_CLASS EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS
|
||||
#define MY_CLASS EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS
|
||||
|
||||
static void
|
||||
_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd)
|
||||
_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_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_Stack_Manager_Data *pd)
|
|||
static void
|
||||
_running_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
Efl_Ui_Spotlight_Stack_Manager_Data *pd = efl_data_scope_safe_get(data, MY_CLASS);
|
||||
Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight)
|
||||
_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Fade_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight)
|
||||
{
|
||||
if (spotlight)
|
||||
{
|
||||
|
@ -90,7 +90,7 @@ _efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Sp
|
|||
}
|
||||
|
||||
static void
|
||||
_update_ids(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, int avoid_index)
|
||||
_update_ids(Eo *obj, Efl_Ui_Spotlight_Fade_Manager_Data *pd, int avoid_index)
|
||||
{
|
||||
for (int i = 0; i < 2; ++i)
|
||||
{
|
||||
|
@ -102,7 +102,7 @@ _update_ids(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, int avoid_index)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_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_ui_spotlight_fade_manager_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_content_add(Eo *obj EIN
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_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_ui_spotlight_fade_manager_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, int from, int to)
|
||||
_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Eina_Size2D size)
|
||||
_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Fade_Manager_Data *pd, Eina_Size2D size)
|
||||
{
|
||||
pd->page_size = size;
|
||||
_geom_sync(obj, pd);
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
_efl_ui_spotlight_stack_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd)
|
||||
_efl_ui_spotlight_fade_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Fade_Manager_Data *pd)
|
||||
{
|
||||
efl_invalidate(efl_super(obj, MY_CLASS));
|
||||
|
||||
|
@ -201,7 +201,7 @@ _efl_ui_spotlight_stack_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_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)
|
||||
_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_Manager_Data *pd, Eina_Bool animation)
|
||||
{
|
||||
for (int i = 0; i < 2; ++i)
|
||||
{
|
||||
|
@ -212,10 +212,10 @@ _efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_animated_transition_set
|
|||
}
|
||||
|
||||
EOLIAN static Eina_Bool
|
||||
_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd)
|
||||
_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_Manager_Data *pd)
|
||||
{
|
||||
return pd->animation;
|
||||
}
|
||||
|
||||
|
||||
#include "efl_ui_spotlight_stack_manager.eo.c"
|
||||
#include "efl_ui_spotlight_fade_manager.eo.c"
|
|
@ -1,6 +1,6 @@
|
|||
class @beta Efl.Ui.Spotlight.Stack_Manager extends Efl.Ui.Spotlight.Manager
|
||||
class @beta Efl.Ui.Spotlight.Fade_Manager extends Efl.Ui.Spotlight.Manager
|
||||
{
|
||||
c_prefix: efl_ui_spotlight_manager_stack;
|
||||
c_prefix: efl_ui_spotlight_manager_fade;
|
||||
implements {
|
||||
Efl.Ui.Spotlight.Manager.bind;
|
||||
Efl.Ui.Spotlight.Manager.content_add;
|
|
@ -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_STACK_MANAGER_CLASS);
|
||||
Efl_Ui_Spotlight_Manager *manager = efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS);
|
||||
return efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, parent,
|
||||
efl_ui_spotlight_manager_set(efl_added, manager));
|
||||
}
|
||||
|
|
|
@ -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_STACK_MANAGER_CLASS);
|
||||
stack = efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS);
|
||||
efl_ui_spotlight_manager_set(obj, stack);
|
||||
|
||||
return obj;
|
||||
|
|
|
@ -147,7 +147,7 @@ pub_eo_files = [
|
|||
'efl_ui_spotlight_container.eo',
|
||||
'efl_ui_spotlight_manager.eo',
|
||||
'efl_ui_spotlight_scroll_manager.eo',
|
||||
'efl_ui_spotlight_stack_manager.eo',
|
||||
'efl_ui_spotlight_fade_manager.eo',
|
||||
'efl_ui_spotlight_indicator.eo',
|
||||
'efl_ui_spotlight_icon_indicator.eo',
|
||||
'efl_ui_spotlight_util.eo',
|
||||
|
@ -917,7 +917,7 @@ elementary_src = [
|
|||
'efl_ui_spotlight_manager.c',
|
||||
'efl_ui_spotlight_plain_manager.c',
|
||||
'efl_ui_spotlight_scroll_manager.c',
|
||||
'efl_ui_spotlight_stack_manager.c',
|
||||
'efl_ui_spotlight_fade_manager.c',
|
||||
'efl_ui_spotlight_indicator.c',
|
||||
'efl_ui_spotlight_icon_indicator.c',
|
||||
'efl_ui_spotlight_util.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_STACK_MANAGER_CLASS));
|
||||
efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_FADE_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_STACK_MANAGER_CLASS);
|
||||
Eo *manager2 = efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS);
|
||||
Eina_Bool animated_transition_manager;
|
||||
efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, win,
|
||||
efl_ui_spotlight_manager_set(efl_added, manager2),
|
||||
|
|
Loading…
Reference in New Issue