summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-01-28 17:05:44 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-02-01 14:21:27 -0800
commit8014b0c70d69439007125ea740fa331460ead50f (patch)
treea1b6e4507f9ef2fb902d5f6e6d1af0dc2d6415d9
parentcd4762d203847aed7bf04333735013f4a8675228 (diff)
win: remove animator,tick.
-rw-r--r--src/lib/elm_win.c61
-rw-r--r--src/lib/elm_win.eo1
2 files changed, 0 insertions, 62 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index d3e8d57d7..a3d139e79 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -208,11 +208,6 @@ struct _Elm_Win_Data
208 208
209 void *trap_data; 209 void *trap_data;
210 210
211 struct
212 {
213 unsigned short wants;
214 } animator;
215
216 double aspect; 211 double aspect;
217 int size_base_w, size_base_h; 212 int size_base_w, size_base_h;
218 int size_step_w, size_step_h; 213 int size_step_w, size_step_h;
@@ -3336,60 +3331,6 @@ _accel_is_gl(void)
3336 return EINA_FALSE; 3331 return EINA_FALSE;
3337} 3332}
3338 3333
3339static Eina_Bool
3340_animator_tick_cb(void *_obj, Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
3341{
3342 Elm_Win *obj = _obj;
3343
3344 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_ANIMATOR_TICK, event_info));
3345
3346 return EO_CALLBACK_CONTINUE;
3347}
3348
3349static Eina_Bool
3350_cb_added(void *_data,
3351 Eo *obj,
3352 const Eo_Event_Description *desc EINA_UNUSED,
3353 void *event_info)
3354{
3355 const Eo_Callback_Array_Item *event = event_info;
3356 Elm_Win_Data *data = _data;
3357
3358 if (event->desc == ELM_WIN_EVENT_ANIMATOR_TICK)
3359 {
3360 data->animator.wants++;
3361 if (data->animator.wants == 1)
3362 {
3363 eo_do(evas_object_evas_get(obj),
3364 eo_event_callback_add(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _animator_tick_cb, obj));
3365 }
3366 }
3367
3368 return EO_CALLBACK_CONTINUE;
3369}
3370
3371static Eina_Bool
3372_cb_deled(void *_data,
3373 Eo *obj EINA_UNUSED,
3374 const Eo_Event_Description *desc EINA_UNUSED,
3375 void *event_info)
3376{
3377 const Eo_Callback_Array_Item *event = event_info;
3378 Elm_Win_Data *data = _data;
3379
3380 if (event->desc == ELM_WIN_EVENT_ANIMATOR_TICK)
3381 {
3382 data->animator.wants--;
3383 if (data->animator.wants == 0)
3384 {
3385 eo_do(evas_object_evas_get(obj),
3386 eo_event_callback_del(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _animator_tick_cb, obj));
3387 }
3388 }
3389
3390 return EO_CALLBACK_CONTINUE;
3391}
3392
3393static Eo * 3334static Eo *
3394_elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type type) 3335_elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type type)
3395{ 3336{
@@ -3985,8 +3926,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3985 3926
3986 evas_object_show(sd->edje); 3927 evas_object_show(sd->edje);
3987 3928
3988 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, sd),
3989 eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, sd));
3990 if (type == ELM_WIN_FAKE) 3929 if (type == ELM_WIN_FAKE)
3991 { 3930 {
3992 _elm_win_resize_job(obj); 3931 _elm_win_resize_job(obj);
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index 1d200bf51..c59abfeb2 100644
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -1309,7 +1309,6 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
1309 rotation,changed; 1309 rotation,changed;
1310 profile,changed; 1310 profile,changed;
1311 wm,rotation,changed; 1311 wm,rotation,changed;
1312 animator,tick;
1313 theme,changed; 1312 theme,changed;
1314 elm,action,block_menu; 1313 elm,action,block_menu;
1315 } 1314 }