discomfitor pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/desksanity.git/commit/?id=3623f8a7e041d4ad34f8e3ec473da91f183c88b6
commit 3623f8a7e041d4ad34f8e3ec473da91f183c88b6 Author: Mike Blumenkrantz <[email protected]> Date: Fri Jun 30 16:14:12 2017 -0400 bump dep version, use internal efx --- configure.ac | 2 +- src/desksanity.c | 52 ++++++++++++++++++++++++++-------------------------- src/e_mod_main.c | 12 ++++++------ src/e_mod_main.h | 1 - src/magnify.c | 4 ++-- src/maximize.c | 10 +++++----- src/moveresize.c | 34 +++++++++++++++++----------------- src/pip.c | 14 +++++++------- 8 files changed, 64 insertions(+), 65 deletions(-) diff --git a/configure.ac b/configure.ac index 7978dfa..264c021 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_PROG_LIBTOOL #]) #AC_SUBST(LTLIBINTL) -PKG_CHECK_MODULES([E], [efx enlightenment >= 0.20.0]) +PKG_CHECK_MODULES([E], [enlightenment >= 0.21.0]) release=$(pkg-config --variable=release enlightenment) MODULE_ARCH="$host_os-$host_cpu-$release" AC_SUBST(MODULE_ARCH) diff --git a/src/desksanity.c b/src/desksanity.c index 144ed69..93d68a7 100644 --- a/src/desksanity.c +++ b/src/desksanity.c @@ -8,7 +8,7 @@ static Evas_Object *dm_hide = NULL; static DS_Type cur_type = DS_PAN; static void -_ds_end(void *data EINA_UNUSED, Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj EINA_UNUSED) +_ds_end(void *data EINA_UNUSED, E_Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj EINA_UNUSED) { /* hide/delete previous desk's mirror */ evas_object_hide(dm_hide); @@ -48,12 +48,12 @@ dm_add(E_Desk *desk) } static void -_ds_blink2(void *data EINA_UNUSED, Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj) +_ds_blink2(void *data EINA_UNUSED, E_Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj) { E_FREE_FUNC(dm_hide, evas_object_del); evas_object_show(dm_show); - efx_resize(obj, EFX_EFFECT_SPEED_DECELERATE, - EFX_POINT(desk_show->zone->x, desk_show->zone->y), + e_efx_resize(obj, E_EFX_EFFECT_SPEED_DECELERATE, + E_EFX_POINT(desk_show->zone->x, desk_show->zone->y), desk_show->zone->w, desk_show->zone->h, 0.45, _ds_end, NULL); } @@ -153,30 +153,30 @@ _ds_show(E_Desk *desk, int dx, int dy) } dm_show = dm_add(desk); evas_object_move(dm_show, x, y); - efx_move(dm_hide, EFX_EFFECT_SPEED_DECELERATE, EFX_POINT(hx, hy), 0.2, NULL, NULL); - efx_move(dm_show, EFX_EFFECT_SPEED_DECELERATE, EFX_POINT(desk->zone->x, desk->zone->y), 0.2, _ds_end, NULL); + e_efx_move(dm_hide, E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_POINT(hx, hy), 0.2, NULL, NULL); + e_efx_move(dm_show, E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_POINT(desk->zone->x, desk->zone->y), 0.2, _ds_end, NULL); break; case DS_FADE_OUT: - efx_fade(dm_hide, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(0, 0, 0), 0, 0.25, _ds_end, NULL); + e_efx_fade(dm_hide, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_COLOR(0, 0, 0), 0, 0.25, _ds_end, NULL); break; case DS_FADE_IN: E_FREE_FUNC(dm_hide, evas_object_del); dm_show = dm_add(desk); - efx_fade(dm_show, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(0, 0, 0), 0, 0.0, NULL, NULL); - efx_fade(dm_show, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(255, 255, 255), 255, 0.25, _ds_end, NULL); + e_efx_fade(dm_show, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_COLOR(0, 0, 0), 0, 0.0, NULL, NULL); + e_efx_fade(dm_show, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_COLOR(255, 255, 255), 255, 0.25, _ds_end, NULL); break; case DS_BATMAN: evas_object_raise(dm_hide); - efx_spin_start(dm_hide, 1080.0, NULL); - efx_zoom(dm_hide, EFX_EFFECT_SPEED_LINEAR, 1.0, 0.00001, NULL, 0.4, _ds_end, NULL); + e_efx_spin_start(dm_hide, 1080.0, NULL); + e_efx_zoom(dm_hide, E_EFX_EFFECT_SPEED_LINEAR, 1.0, 0.00001, NULL, 0.4, _ds_end, NULL); break; case DS_ZOOM_IN: dm_show = dm_add(desk); - efx_zoom(dm_show, EFX_EFFECT_SPEED_LINEAR, 0.000001, 1.0, NULL, 0.4, _ds_end, NULL); + e_efx_zoom(dm_show, E_EFX_EFFECT_SPEED_LINEAR, 0.000001, 1.0, NULL, 0.4, _ds_end, NULL); break; case DS_ZOOM_OUT: evas_object_raise(dm_hide); - efx_zoom(dm_hide, EFX_EFFECT_SPEED_LINEAR, 1.0, 0.0000001, NULL, 0.4, _ds_end, NULL); + e_efx_zoom(dm_hide, E_EFX_EFFECT_SPEED_LINEAR, 1.0, 0.0000001, NULL, 0.4, _ds_end, NULL); break; case DS_GROW: x = hx = desk->zone->x; @@ -197,19 +197,19 @@ _ds_show(E_Desk *desk, int dx, int dy) evas_object_clip_set(dm_show, o); evas_object_show(o); e_comp_object_util_del_list_append(dm_show, o); - efx_resize(o, EFX_EFFECT_SPEED_LINEAR, EFX_POINT(hx, hy), desk->zone->w, desk->zone->h, 0.4, _ds_end, NULL); + e_efx_resize(o, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_POINT(hx, hy), desk->zone->w, desk->zone->h, 0.4, _ds_end, NULL); break; case DS_ROTATE_OUT: - efx_move_circle(dm_hide, EFX_EFFECT_SPEED_LINEAR, EFX_POINT(desk->zone->x + (desk->zone->w / 2), desk->zone->y + (desk->zone->h / 2)), + e_efx_move_circle(dm_hide, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_POINT(desk->zone->x + (desk->zone->w / 2), desk->zone->y + (desk->zone->h / 2)), 720, 0.4, NULL, NULL); - efx_resize(dm_hide, EFX_EFFECT_SPEED_LINEAR, NULL, 1, 1, 0.4, _ds_end, NULL); + e_efx_resize(dm_hide, E_EFX_EFFECT_SPEED_LINEAR, NULL, 1, 1, 0.4, _ds_end, NULL); break; case DS_ROTATE_IN: dm_show = dm_add(desk); evas_object_resize(dm_show, 1, 1); - efx_move_circle(dm_show, EFX_EFFECT_SPEED_LINEAR, EFX_POINT(desk->zone->x + (desk->zone->w / 2), desk->zone->y + (desk->zone->h / 2)), + e_efx_move_circle(dm_show, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_POINT(desk->zone->x + (desk->zone->w / 2), desk->zone->y + (desk->zone->h / 2)), 720, 0.4, NULL, NULL); - efx_resize(dm_show, EFX_EFFECT_SPEED_LINEAR, NULL, desk->zone->w, desk->zone->h, 0.4, _ds_end, NULL); + e_efx_resize(dm_show, E_EFX_EFFECT_SPEED_LINEAR, NULL, desk->zone->w, desk->zone->h, 0.4, _ds_end, NULL); break; case DS_SLIDE_SPLIT: { @@ -259,7 +259,7 @@ _ds_show(E_Desk *desk, int dx, int dy) else exy.y = desk_show->zone->y + (dy * desk_show->zone->h); } - efx_move(dmh, EFX_EFFECT_SPEED_ACCELERATE, + e_efx_move(dmh, E_EFX_EFFECT_SPEED_ACCELERATE, &exy, 0.5, (i == (num - 1)) ? _ds_end : NULL, NULL); dmh = NULL; } @@ -300,7 +300,7 @@ _ds_show(E_Desk *desk, int dx, int dy) evas_object_clip_set(dmh[i], clip[i]); evas_object_show(clip[i]); /* apply effect coords */ - efx_move(clip[i], EFX_EFFECT_SPEED_ACCELERATE, + e_efx_move(clip[i], E_EFX_EFFECT_SPEED_ACCELERATE, &exy[i], 0.8, (i == 3) ? _ds_end : NULL, NULL); } } @@ -334,8 +334,8 @@ _ds_show(E_Desk *desk, int dx, int dy) evas_object_clip_set(dmh[i], clip[i]); evas_object_show(clip[i]); /* resize all quads to 1x1 while moving towards center */ - efx_resize(clip[i], EFX_EFFECT_SPEED_ACCELERATE, - EFX_POINT(desk->zone->x + (desk->zone->w / 2), desk->zone->y + (desk->zone->h / 2)), + e_efx_resize(clip[i], E_EFX_EFFECT_SPEED_ACCELERATE, + E_EFX_POINT(desk->zone->x + (desk->zone->w / 2), desk->zone->y + (desk->zone->h / 2)), 1, 1 ,0.8, (i == 3) ? _ds_end : NULL, NULL); } } @@ -362,8 +362,8 @@ _ds_show(E_Desk *desk, int dx, int dy) evas_object_clip_set(dm_show, clip); evas_object_show(clip); /* resize clip to 1px high while moving towards center */ - efx_resize(clip, EFX_EFFECT_SPEED_ACCELERATE, - EFX_POINT(desk->zone->x, desk->zone->y + (desk->zone->h / 2)), + e_efx_resize(clip, E_EFX_EFFECT_SPEED_ACCELERATE, + E_EFX_POINT(desk->zone->x, desk->zone->y + (desk->zone->h / 2)), desk->zone->w, 1, 0.45, _ds_blink2, NULL); } break; @@ -378,8 +378,8 @@ _ds_show(E_Desk *desk, int dx, int dy) e_comp_object_util_del_list_append(dm_hide, clip); evas_object_show(clip); /* resize clip to 1x1 while moving towards center */ - efx_resize(clip, EFX_EFFECT_SPEED_DECELERATE, - EFX_POINT(desk->zone->x + (desk->zone->w / 2), desk->zone->y + (desk->zone->h / 2)), + e_efx_resize(clip, E_EFX_EFFECT_SPEED_DECELERATE, + E_EFX_POINT(desk->zone->x + (desk->zone->w / 2), desk->zone->y + (desk->zone->h / 2)), 1, 1, 0.6, _ds_end, NULL); } break; diff --git a/src/e_mod_main.c b/src/e_mod_main.c index ba65669..8ffb850 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -20,7 +20,7 @@ static Eina_Bool focus_last_focused_per_desktop; static unsigned int pending_flip; static void -_ds_fade_end(Ecore_Cb cb, Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj EINA_UNUSED) +_ds_fade_end(Ecore_Cb cb, E_Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj EINA_UNUSED) { E_FREE_FUNC(fade_obj, evas_object_del); if (cb) @@ -241,7 +241,7 @@ e_modapi_init(E_Module *m) snprintf(buf, sizeof(buf), "%s/e-module-desksanity.edj", m->dir); elm_theme_overlay_add(NULL, buf); - efx_init(); + e_efx_init(); _e_mod_ds_config_load(); mod = E_NEW(Mod, 1); @@ -300,7 +300,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) focus_list = eina_list_free(focus_list); E_FREE_FUNC(ds_key_focus_timeout, ecore_timer_del); E_FREE_LIST(ds_key_focus_desks, e_object_unref); - //efx_shutdown(); broken... + //e_efx_shutdown(); broken... return 1; } @@ -323,15 +323,15 @@ ds_fade_setup(Evas_Object_Event_Cb click_cb) evas_object_layer_set(fade_obj, E_LAYER_MENU + 1); evas_object_pass_events_set(fade_obj, 1); evas_object_show(fade_obj); - efx_fade(fade_obj, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(0, 0, 0), 0, 0.0, NULL, NULL); - efx_fade(fade_obj, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(0, 0, 0), 192, 0.3, NULL, NULL); + e_efx_fade(fade_obj, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_COLOR(0, 0, 0), 0, 0.0, NULL, NULL); + e_efx_fade(fade_obj, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_COLOR(0, 0, 0), 192, 0.3, NULL, NULL); } EINTERN void ds_fade_end(Ecore_Cb end_cb, Evas_Object_Event_Cb click_cb) { evas_object_pass_events_set(fade_obj, 1); - efx_fade(fade_obj, EFX_EFFECT_SPEED_DECELERATE, EFX_COLOR(0, 0, 0), 0, 0.3, (Efx_End_Cb)_ds_fade_end, end_cb); + e_efx_fade(fade_obj, E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_COLOR(0, 0, 0), 0, 0.3, (E_Efx_End_Cb)_ds_fade_end, end_cb); if (click_cb) evas_object_event_callback_del(fade_obj, EVAS_CALLBACK_MOUSE_DOWN, click_cb); } diff --git a/src/e_mod_main.h b/src/e_mod_main.h index b5eea1d..0595899 100644 --- a/src/e_mod_main.h +++ b/src/e_mod_main.h @@ -6,7 +6,6 @@ #endif #include <e.h> -#include <Efx.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/src/magnify.c b/src/magnify.c index 1144d30..adb42fc 100644 --- a/src/magnify.c +++ b/src/magnify.c @@ -30,7 +30,7 @@ static void _current_update(int n) { if (current_mag != -1) - efx_zoom_reset(magnifiers[current_mag]); + e_efx_zoom_reset(magnifiers[current_mag]); current_mag = n; } @@ -47,7 +47,7 @@ _magnify_update(int x, int y) w = zone->w / MAG_SIZE_FACTOR; h = zone->h / MAG_SIZE_FACTOR; evas_object_geometry_set(clip, x - (w / 2), y - (h / 2), w, h); - efx_zoom(magnifiers[zone->num], EFX_EFFECT_SPEED_LINEAR, 0, 2.0, EFX_POINT(x, y), 0, NULL, NULL); + e_efx_zoom(magnifiers[zone->num], E_EFX_EFFECT_SPEED_LINEAR, 0, 2.0, E_EFX_POINT(x, y), 0, NULL, NULL); } static Eina_Bool diff --git a/src/maximize.c b/src/maximize.c index 25dc15e..0af3b1a 100644 --- a/src/maximize.c +++ b/src/maximize.c @@ -29,7 +29,7 @@ _ds_unmaximize_post(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) if (!rect) return; evas_object_geometry_set(obj, rect->x, rect->y, rect->w, rect->h); free(rect); - efx_resize(ec->frame, EFX_EFFECT_SPEED_SINUSOIDAL, EFX_POINT(x, y), w, h, time, NULL, NULL); + e_efx_resize(ec->frame, E_EFX_EFFECT_SPEED_SINUSOIDAL, E_EFX_POINT(x, y), w, h, time, NULL, NULL); ecore_timer_add(0.1, _ds_unmaximize_render, NULL); } @@ -55,12 +55,12 @@ _ds_unmaximize_pre(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EI max = !!evas_object_data_del(ec->frame, "__DSMAX"); if (max) - efx_resize_stop(ec->frame); + e_efx_resize_stop(ec->frame); ec->maximize_override = 0; } static void -_ds_maximize_done(void *data, Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj EINA_UNUSED) +_ds_maximize_done(void *data, E_Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj EINA_UNUSED) { E_Client *ec = data; @@ -86,7 +86,7 @@ _ds_maximize(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU if ((!w) || (!h)) return; //new client, don't break the universe ec->maximize_override = 1; evas_object_geometry_set(ec->frame, x, y, w, h); - efx_resize(ec->frame, EFX_EFFECT_SPEED_SINUSOIDAL, EFX_POINT(ecx, ecy), ecw, ech, time, _ds_maximize_done, ec); + e_efx_resize(ec->frame, E_EFX_EFFECT_SPEED_SINUSOIDAL, E_EFX_POINT(ecx, ecy), ecw, ech, time, _ds_maximize_done, ec); evas_object_data_set(ec->frame, "__DSMAX", (void*)1); } @@ -98,7 +98,7 @@ _ds_fullscreen(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_U evas_object_data_del(ec->frame, "__DSMAX"); free(evas_object_data_del(ec->frame, "__DSUMAX")); ec->maximize_override = 0; - efx_resize_stop(ec->frame); + e_efx_resize_stop(ec->frame); } static void diff --git a/src/moveresize.c b/src/moveresize.c index 9b76869..d0e23f7 100644 --- a/src/moveresize.c +++ b/src/moveresize.c @@ -57,7 +57,7 @@ move_x_update(E_Client *ec) if (evas_object_clip_get(mr_line_x) != zone->bg_clip_object) { evas_object_clip_set(mr_line_x, zone->bg_clip_object); - efx_reclip(mr_line_x); + e_efx_reclip(mr_line_x); } evas_object_geometry_set(mr_line_x, ec->x, zone->y, 1, zone->h); @@ -83,7 +83,7 @@ move_y_update(E_Client *ec) if (evas_object_clip_get(mr_line_y) != zone->bg_clip_object) { evas_object_clip_set(mr_line_y, zone->bg_clip_object); - efx_reclip(mr_line_y); + e_efx_reclip(mr_line_y); } evas_object_geometry_set(mr_line_y, zone->x, ec->y, zone->w, 1); @@ -241,11 +241,11 @@ line_add(Evas *e) } static void -pulse(void *d EINA_UNUSED, Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj) +pulse(void *d EINA_UNUSED, E_Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj) { - efx_queue_append(obj, EFX_EFFECT_SPEED_SINUSOIDAL, EFX_QUEUED_EFFECT(EFX_EFFECT_FADE(255, 255, 255, 255)), 0.6, NULL, NULL); - efx_queue_append(obj, EFX_EFFECT_SPEED_SINUSOIDAL, EFX_QUEUED_EFFECT(EFX_EFFECT_FADE(120, 120, 120, 120)), 0.9, pulse, NULL); - efx_queue_run(obj); + e_efx_queue_append(obj, E_EFX_EFFECT_SPEED_SINUSOIDAL, E_EFX_QUEUED_EFFECT(E_EFX_EFFECT_FADE(255, 255, 255, 255)), 0.6, NULL, NULL); + e_efx_queue_append(obj, E_EFX_EFFECT_SPEED_SINUSOIDAL, E_EFX_QUEUED_EFFECT(E_EFX_EFFECT_FADE(120, 120, 120, 120)), 0.9, pulse, NULL); + e_efx_queue_run(obj); } static void @@ -290,14 +290,14 @@ move_update(void *d EINA_UNUSED, E_Client *ec) static void move_end(void *d EINA_UNUSED, E_Client *ec EINA_UNUSED) { - efx_queue_clear(mr_line_x); - efx_queue_clear(mr_line_y); - efx_fade_reset(mr_line_x); - efx_fade_reset(mr_line_y); - efx_fade(mr_line_x, EFX_EFFECT_SPEED_DECELERATE, EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); - efx_fade(mr_line_y, EFX_EFFECT_SPEED_DECELERATE, EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); - efx_fade(move_text_x, EFX_EFFECT_SPEED_DECELERATE, EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); - efx_fade(move_text_y, EFX_EFFECT_SPEED_DECELERATE, EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); + e_efx_queue_clear(mr_line_x); + e_efx_queue_clear(mr_line_y); + e_efx_fade_reset(mr_line_x); + e_efx_fade_reset(mr_line_y); + e_efx_fade(mr_line_x, E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); + e_efx_fade(mr_line_y, E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); + e_efx_fade(move_text_x, E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); + e_efx_fade(move_text_y, E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); ds_fade_end(_fade_end, NULL); } @@ -373,12 +373,12 @@ resize_end(void *d EINA_UNUSED, E_Client *ec EINA_UNUSED) { unsigned int x; - efx_fade(resize_text, EFX_EFFECT_SPEED_DECELERATE, EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); + e_efx_fade(resize_text, E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); for (x = 0; x < 4; x++) { if (!resize_rect[x]) continue; - efx_fade(resize_rect[x], EFX_EFFECT_SPEED_DECELERATE, EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); - efx_queue_clear(resize_rect[x]); + e_efx_fade(resize_rect[x], E_EFX_EFFECT_SPEED_DECELERATE, E_EFX_COLOR(0, 0, 0), 0, 0.3, NULL, NULL); + e_efx_queue_clear(resize_rect[x]); } ds_fade_end(_fade_end, NULL); } diff --git a/src/pip.c b/src/pip.c index 793c81d..4bf7fe8 100644 --- a/src/pip.c +++ b/src/pip.c @@ -203,9 +203,9 @@ _pip_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, if (evas_key_modifier_is_set(ev->modifiers, "Control")) { if (ev->z < 0) - efx_zoom(pip->pip, EFX_EFFECT_SPEED_LINEAR, 0, pip->zoom -= 0.05, EFX_POINT(ev->output.x, ev->output.y), 0.2, NULL, NULL); + e_efx_zoom(pip->pip, E_EFX_EFFECT_SPEED_LINEAR, 0, pip->zoom -= 0.05, E_EFX_POINT(ev->output.x, ev->output.y), 0.2, NULL, NULL); else if (ev->z > 0) - efx_zoom(pip->pip, EFX_EFFECT_SPEED_LINEAR, 0, pip->zoom += 0.05, EFX_POINT(ev->output.x, ev->output.y), 0.2, NULL, NULL); + e_efx_zoom(pip->pip, E_EFX_EFFECT_SPEED_LINEAR, 0, pip->zoom += 0.05, E_EFX_POINT(ev->output.x, ev->output.y), 0.2, NULL, NULL); } else { @@ -213,7 +213,7 @@ _pip_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, pip->opacity = E_CLAMP(pip->opacity + 15, 0, 255); else if (ev->z > 0) pip->opacity = E_CLAMP(pip->opacity - 15, 0, 255); - efx_fade(pip->pip, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(pip->opacity, pip->opacity, pip->opacity), pip->opacity, 0.2, NULL, NULL); + e_efx_fade(pip->pip, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_COLOR(pip->opacity, pip->opacity, pip->opacity), pip->opacity, 0.2, NULL, NULL); } } @@ -345,9 +345,9 @@ _pip_manage(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_ } static void -_pip_fade_end(void *d EINA_UNUSED, Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj) +_pip_fade_end(void *d EINA_UNUSED, E_Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj) { - ecore_job_add((Ecore_Cb)efx_fade_reset, obj); + ecore_job_add((Ecore_Cb)e_efx_fade_reset, obj); } static void @@ -377,8 +377,8 @@ _pip_create(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, _pip_mouse_wheel, pip); evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _pip_del, ec); - efx_fade(o, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(0, 0, 0), 0, 0.0, NULL, NULL); - efx_fade(o, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(255, 255, 255), 255, 0.2, _pip_fade_end, NULL); + e_efx_fade(o, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_COLOR(0, 0, 0), 0, 0.0, NULL, NULL); + e_efx_fade(o, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_COLOR(255, 255, 255), 255, 0.2, _pip_fade_end, NULL); eina_hash_add(pips, &ec->frame, pip); if (editing) --
