forked from enlightenment/efl
efl_ui_spotlight_manager_*: remove size and position events
there is no need to listen to them, they are already listent to by the container, and new sizes are told via the size property. Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Differential Revision: https://phab.enlightenment.org/D10704
This commit is contained in:
parent
6399ae4a84
commit
3ad70802c6
|
@ -39,23 +39,6 @@ _geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd)
|
|||
efl_gfx_entity_geometry_set(entity, goal);
|
||||
}
|
||||
|
||||
static void
|
||||
_resize_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
_geom_sync(data, efl_data_scope_get(data, MY_CLASS));
|
||||
}
|
||||
|
||||
static void
|
||||
_move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
_geom_sync(data, efl_data_scope_get(data, MY_CLASS));
|
||||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(group_callback,
|
||||
{EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb},
|
||||
{EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb},
|
||||
)
|
||||
|
||||
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)
|
||||
{
|
||||
|
@ -64,7 +47,6 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Sp
|
|||
Efl_Ui_Widget *index;
|
||||
|
||||
pd->container = spotlight;
|
||||
efl_event_callback_array_add(pd->container, group_callback(), obj);
|
||||
|
||||
for (int i = 0; i < efl_content_count(spotlight) ; ++i) {
|
||||
Efl_Gfx_Entity *elem = efl_pack_content_get(spotlight, i);
|
||||
|
@ -144,8 +126,6 @@ _efl_ui_spotlight_manager_plain_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_
|
|||
{
|
||||
efl_destructor(efl_super(obj, MY_CLASS));
|
||||
|
||||
efl_event_callback_array_del(pd->container, group_callback(), obj);
|
||||
|
||||
for (int i = 0; i < efl_content_count(pd->container); ++i)
|
||||
{
|
||||
Efl_Gfx_Stack *elem = efl_pack_content_get(pd->container, i);
|
||||
|
|
|
@ -76,18 +76,6 @@ _apply_box_properties(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd)
|
|||
_propagate_progress(obj, current_pos);
|
||||
}
|
||||
|
||||
static void
|
||||
_resize_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
_apply_box_properties(data, efl_data_scope_get(data, EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS));
|
||||
}
|
||||
|
||||
static void
|
||||
_move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
_apply_box_properties(data, efl_data_scope_get(data, EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS));
|
||||
}
|
||||
|
||||
static void
|
||||
_mouse_down_cb(void *data,
|
||||
const Efl_Event *event)
|
||||
|
@ -174,8 +162,6 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_S
|
|||
if (spotlight)
|
||||
{
|
||||
pd->container = spotlight;
|
||||
efl_event_callback_add(pd->container, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
|
||||
efl_event_callback_add(pd->container, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
|
||||
|
||||
pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
|
||||
evas_object_evas_get(pd->container));
|
||||
|
@ -325,8 +311,6 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animated_transition_ge
|
|||
EOLIAN static void
|
||||
_efl_ui_spotlight_manager_scroll_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd EINA_UNUSED)
|
||||
{
|
||||
efl_event_callback_del(pd->container, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
|
||||
efl_event_callback_del(pd->container, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
|
||||
efl_event_callback_array_del(efl_content_get(efl_part(pd->container, "efl.event")), mouse_listeners(), obj);
|
||||
efl_del(pd->backclip);
|
||||
efl_del(pd->foreclip);
|
||||
|
|
|
@ -32,18 +32,6 @@ _geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_resize_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
_geom_sync(data, efl_data_scope_get(data, MY_CLASS));
|
||||
}
|
||||
|
||||
static void
|
||||
_move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
_geom_sync(data, efl_data_scope_get(data, MY_CLASS));
|
||||
}
|
||||
|
||||
static void
|
||||
_running_cb(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
|
@ -74,9 +62,6 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Sp
|
|||
{
|
||||
pd->container = spotlight;
|
||||
|
||||
efl_event_callback_add(pd->container, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
|
||||
efl_event_callback_add(pd->container, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
|
||||
|
||||
pd->alpha_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, obj);
|
||||
efl_animation_alpha_set(pd->alpha_anim, 0.0, 1.0);
|
||||
efl_animation_duration_set(pd->alpha_anim, 0.5);
|
||||
|
@ -165,9 +150,6 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_U
|
|||
EOLIAN static void
|
||||
_efl_ui_spotlight_manager_stack_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd EINA_UNUSED)
|
||||
{
|
||||
efl_event_callback_del(pd->container, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
|
||||
efl_event_callback_del(pd->container, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
|
||||
|
||||
efl_invalidate(efl_super(obj, MY_CLASS));
|
||||
|
||||
for (int i = 0; i < efl_content_count(pd->container); ++i)
|
||||
|
|
Loading…
Reference in New Issue