rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e - unbreak build due to efl changes

This commit is contained in:
Carsten Haitzler 2019-02-22 11:12:00 +00:00
parent 6f4d2bd16d
commit ea3f6ed68f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/e.h
View File

@ -17,6 +17,7 @@
# endif # endif
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
# define EFL_EO_API_SUPPORT
# define EFL_BETA_API_SUPPORT # define EFL_BETA_API_SUPPORT
#endif #endif

8
src/bin/e_comp_wl.c
View File

@ -2188,7 +2188,7 @@ _cb_early_frame_cb(void *data, const Efl_Event *event EINA_UNUSED)
if (ec->comp_data->early_frame++ > 15) if (ec->comp_data->early_frame++ > 15)
{ {
ec->comp_data->early_frame = 0; ec->comp_data->early_frame = 0;
efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK, efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
_cb_early_frame_cb, data); _cb_early_frame_cb, data);
} }
} }
@ -2198,14 +2198,14 @@ _e_comp_wl_surface_early_frame(E_Client *ec)
{ {
if (e_comp_object_damage_exists(ec->frame)) if (e_comp_object_damage_exists(ec->frame))
{ {
efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK, efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
_cb_early_frame_cb, ec); _cb_early_frame_cb, ec);
ec->comp_data->early_frame = 0; ec->comp_data->early_frame = 0;
return; return;
} }
if (ec->on_post_updates) return; if (ec->on_post_updates) return;
if (!ec->comp_data->early_frame) if (!ec->comp_data->early_frame)
efl_event_callback_add(e_comp->evas, EFL_EVENT_ANIMATOR_TICK, efl_event_callback_add(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
_cb_early_frame_cb, ec); _cb_early_frame_cb, ec);
ec->comp_data->early_frame = 1; ec->comp_data->early_frame = 1;
} }
@ -2582,7 +2582,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
/* make sure this is a wayland client */ /* make sure this is a wayland client */
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return; if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK, efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
_cb_early_frame_cb, ec); _cb_early_frame_cb, ec);
ec->comp_data->early_frame = 0; ec->comp_data->early_frame = 0;