From e165854a78949cd76fedd84cd124de2185c910c9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 10 Jun 2016 18:02:03 +0900 Subject: [PATCH] Evas: Rename Zoomable_Interface to Efl.Ui.Zoomable --- src/Makefile_Evas.am | 2 +- src/lib/elementary/elm_map.c | 4 ++-- src/lib/elementary/elm_photocam.c | 10 +++++----- src/lib/elementary/elm_photocam.eo | 2 +- src/lib/evas/Evas_Eo.h | 2 +- src/lib/evas/canvas/common_interfaces.c | 2 +- .../canvas/{evas_zoomable_interface.eo => efl_ui_zoomable.eo} | 3 ++- 7 files changed, 13 insertions(+), 12 deletions(-) rename src/lib/evas/canvas/{evas_zoomable_interface.eo => efl_ui_zoomable.eo} (58%) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 263bc48..50447a7 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -14,7 +14,7 @@ evas_eolian_pub_files = \ lib/evas/canvas/efl_ui_clickable.eo \ lib/evas/canvas/efl_ui_scrollable.eo \ lib/evas/canvas/efl_ui_selectable.eo \ - lib/evas/canvas/evas_zoomable_interface.eo \ + lib/evas/canvas/efl_ui_zoomable.eo \ lib/evas/canvas/evas_canvas3d_camera.eo\ lib/evas/canvas/evas_canvas3d_texture.eo\ lib/evas/canvas/evas_canvas3d_material.eo\ diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index d7d1d6b..70619e0 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -1071,7 +1071,7 @@ _zoom_timeout_cb(void *data) _smooth_update(sd); sd->zoom_timer = NULL; eo_event_callback_call - (sd->obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); + (sd->obj, EFL_UI_EVENT_ZOOM_STOP, NULL); return ECORE_CALLBACK_CANCEL; } @@ -1133,7 +1133,7 @@ _zoom_do(Elm_Map_Data *sd, } else eo_event_callback_call - (sd->obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL); + (sd->obj, EFL_UI_EVENT_ZOOM_START, NULL); if (sd->obj) sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj); diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 2ad3904..430bbe8 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -787,7 +787,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) sd->no_smooth--; if (!sd->no_smooth) _smooth_update(data); eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); - eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL); } return EO_CALLBACK_CONTINUE; @@ -1103,7 +1103,7 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd) sd->no_smooth--; if (!sd->no_smooth) _smooth_update(obj); _zoom_do(obj, 1.0); - eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL); } } @@ -1966,12 +1966,12 @@ done: if (!sd->paused) { if (started) - eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_START, NULL); if (!an) - eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL); } if (zoom_changed) - eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_CHANGE, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL); } EOLIAN static double diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo index c064872..2e2e61e 100644 --- a/src/lib/elementary/elm_photocam.eo +++ b/src/lib/elementary/elm_photocam.eo @@ -13,7 +13,7 @@ enum Elm.Photocam.Zoom_Mode class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, Elm.Interface.Atspi_Widget_Action, Efl.File, Efl.Ui.Clickable, Efl.Ui.Scrollable, - Evas.Zoomable_Interface) + Efl.Ui.Zoomable) { legacy_prefix: elm_photocam; eo_prefix: elm_obj_photocam; diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 2547431..f04bec5 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -6,7 +6,7 @@ #include "canvas/efl_ui_clickable.eo.h" #include "canvas/efl_ui_scrollable.eo.h" #include "canvas/efl_ui_selectable.eo.h" -#include "canvas/evas_zoomable_interface.eo.h" +#include "canvas/efl_ui_zoomable.eo.h" #include "canvas/evas_canvas.eo.h" diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c index 0cbbd8e..f2ffc24 100644 --- a/src/lib/evas/canvas/common_interfaces.c +++ b/src/lib/evas/canvas/common_interfaces.c @@ -5,4 +5,4 @@ #include "canvas/efl_ui_clickable.eo.c" #include "canvas/efl_ui_scrollable.eo.c" #include "canvas/efl_ui_selectable.eo.c" -#include "canvas/evas_zoomable_interface.eo.c" +#include "canvas/efl_ui_zoomable.eo.c" diff --git a/src/lib/evas/canvas/evas_zoomable_interface.eo b/src/lib/evas/canvas/efl_ui_zoomable.eo similarity index 58% rename from src/lib/evas/canvas/evas_zoomable_interface.eo rename to src/lib/evas/canvas/efl_ui_zoomable.eo index 5f65fa5..325948d 100644 --- a/src/lib/evas/canvas/evas_zoomable_interface.eo +++ b/src/lib/evas/canvas/efl_ui_zoomable.eo @@ -1,5 +1,6 @@ -interface Evas.Zoomable_Interface () +interface Efl.Ui.Zoomable () { + event_prefix: efl_ui; events { zoom,start; zoom,stop; -- 2.7.4