From 8ea0e7589d8162dba31c5e7d2a6d84694d062910 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 26 Jan 2016 14:07:29 -0800 Subject: [PATCH] win: remove animator,tick. --- legacy/elementary/src/lib/elm_win.c | 61 ------------------------------------ legacy/elementary/src/lib/elm_win.eo | 1 - 2 files changed, 62 deletions(-) diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index ad009b0..a3d139e 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -208,12 +208,6 @@ struct _Elm_Win_Data void *trap_data; - struct - { - Ecore_Animator *obj; - unsigned short wants; - } animator; - double aspect; int size_base_w, size_base_h; int size_step_w, size_step_h; @@ -3337,59 +3331,6 @@ _accel_is_gl(void) return EINA_FALSE; } -static Eina_Bool -_animator_tick_cb(void *_obj) -{ - Elm_Win *obj = _obj; - eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_ANIMATOR_TICK, NULL)); - - return ECORE_CALLBACK_RENEW; -} - -static Eina_Bool -_cb_added(void *_data, - Eo *obj, - const Eo_Event_Description *desc EINA_UNUSED, - void *event_info) -{ - const Eo_Callback_Array_Item *event = event_info; - Elm_Win_Data *data = _data; - - if (event->desc == ELM_WIN_EVENT_ANIMATOR_TICK) - { - data->animator.wants++; - if (data->animator.wants == 1) - { - data->animator.obj = eo_add(ECORE_ANIMATOR_CLASS, obj, - ecore_animator_constructor(_animator_tick_cb, obj)); - } - } - - return EO_CALLBACK_CONTINUE; -} - -static Eina_Bool -_cb_deled(void *_data, - Eo *obj EINA_UNUSED, - const Eo_Event_Description *desc EINA_UNUSED, - void *event_info) -{ - const Eo_Callback_Array_Item *event = event_info; - Elm_Win_Data *data = _data; - - if (event->desc == ELM_WIN_EVENT_ANIMATOR_TICK) - { - data->animator.wants--; - if (data->animator.wants == 0) - { - eo_del(data->animator.obj); - data->animator.obj = NULL; - } - } - - return EO_CALLBACK_CONTINUE; -} - static Eo * _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type type) { @@ -3985,8 +3926,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_ evas_object_show(sd->edje); - eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, sd), - eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, sd)); if (type == ELM_WIN_FAKE) { _elm_win_resize_job(obj); diff --git a/legacy/elementary/src/lib/elm_win.eo b/legacy/elementary/src/lib/elm_win.eo index 1d200bf..c59abfe 100644 --- a/legacy/elementary/src/lib/elm_win.eo +++ b/legacy/elementary/src/lib/elm_win.eo @@ -1309,7 +1309,6 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window, rotation,changed; profile,changed; wm,rotation,changed; - animator,tick; theme,changed; elm,action,block_menu; } -- 2.7.4