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

Evas: Rename Zoomable_Interface to Efl.Ui.Zoomable

This commit is contained in:
Jean-Philippe Andre 2016-06-10 18:02:03 +09:00
parent b2355d7da3
commit e165854a78
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Evas.am
View File

@ -14,7 +14,7 @@ evas_eolian_pub_files = \
lib/evas/canvas/efl_ui_clickable.eo \ lib/evas/canvas/efl_ui_clickable.eo \
lib/evas/canvas/efl_ui_scrollable.eo \ lib/evas/canvas/efl_ui_scrollable.eo \
lib/evas/canvas/efl_ui_selectable.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_camera.eo\
lib/evas/canvas/evas_canvas3d_texture.eo\ lib/evas/canvas/evas_canvas3d_texture.eo\
lib/evas/canvas/evas_canvas3d_material.eo\ lib/evas/canvas/evas_canvas3d_material.eo\

4
src/lib/elementary/elm_map.c
View File

@ -1071,7 +1071,7 @@ _zoom_timeout_cb(void *data)
_smooth_update(sd); _smooth_update(sd);
sd->zoom_timer = NULL; sd->zoom_timer = NULL;
eo_event_callback_call 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; return ECORE_CALLBACK_CANCEL;
} }
@ -1133,7 +1133,7 @@ _zoom_do(Elm_Map_Data *sd,
} }
else else
eo_event_callback_call eo_event_callback_call
(sd->obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL); (sd->obj, EFL_UI_EVENT_ZOOM_START, NULL);
if (sd->obj) if (sd->obj)
sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj); sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);

10
src/lib/elementary/elm_photocam.c
View File

@ -787,7 +787,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
sd->no_smooth--; sd->no_smooth--;
if (!sd->no_smooth) _smooth_update(data); if (!sd->no_smooth) _smooth_update(data);
eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); 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; return EO_CALLBACK_CONTINUE;
@ -1103,7 +1103,7 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
sd->no_smooth--; sd->no_smooth--;
if (!sd->no_smooth) _smooth_update(obj); if (!sd->no_smooth) _smooth_update(obj);
_zoom_do(obj, 1.0); _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 (!sd->paused)
{ {
if (started) 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) 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) 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 EOLIAN static double

2
src/lib/elementary/elm_photocam.eo
View File

@ -13,7 +13,7 @@ enum Elm.Photocam.Zoom_Mode
class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action, Efl.File, Elm.Interface.Atspi_Widget_Action, Efl.File,
Efl.Ui.Clickable, Efl.Ui.Scrollable, Efl.Ui.Clickable, Efl.Ui.Scrollable,
Evas.Zoomable_Interface) Efl.Ui.Zoomable)
{ {
legacy_prefix: elm_photocam; legacy_prefix: elm_photocam;
eo_prefix: elm_obj_photocam; eo_prefix: elm_obj_photocam;

2
src/lib/evas/Evas_Eo.h
View File

@ -6,7 +6,7 @@
#include "canvas/efl_ui_clickable.eo.h" #include "canvas/efl_ui_clickable.eo.h"
#include "canvas/efl_ui_scrollable.eo.h" #include "canvas/efl_ui_scrollable.eo.h"
#include "canvas/efl_ui_selectable.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" #include "canvas/evas_canvas.eo.h"

2
src/lib/evas/canvas/common_interfaces.c
View File

@ -5,4 +5,4 @@
#include "canvas/efl_ui_clickable.eo.c" #include "canvas/efl_ui_clickable.eo.c"
#include "canvas/efl_ui_scrollable.eo.c" #include "canvas/efl_ui_scrollable.eo.c"
#include "canvas/efl_ui_selectable.eo.c" #include "canvas/efl_ui_selectable.eo.c"
#include "canvas/evas_zoomable_interface.eo.c" #include "canvas/efl_ui_zoomable.eo.c"

3
src/lib/evas/canvas/evas_zoomable_interface.eo → src/lib/evas/canvas/efl_ui_zoomable.eo
View File

@ -1,5 +1,6 @@
interface Evas.Zoomable_Interface () interface Efl.Ui.Zoomable ()
{ {
event_prefix: efl_ui;
events { events {
zoom,start; zoom,start;
zoom,stop; zoom,stop;