summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 18:02:03 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 18:06:15 +0900
commite165854a78949cd76fedd84cd124de2185c910c9 (patch)
tree514a4c97708cef61f41f92f5e3c413aa9095e0e5
parentb2355d7da3f9919b4227e803a90b4f68c4230201 (diff)
Evas: Rename Zoomable_Interface to Efl.Ui.Zoomable
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/lib/elementary/elm_map.c4
-rw-r--r--src/lib/elementary/elm_photocam.c10
-rw-r--r--src/lib/elementary/elm_photocam.eo2
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/canvas/common_interfaces.c2
-rw-r--r--src/lib/evas/canvas/efl_ui_zoomable.eo (renamed from src/lib/evas/canvas/evas_zoomable_interface.eo)3
7 files changed, 13 insertions, 12 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 263bc48b93..50447a7c46 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -14,7 +14,7 @@ evas_eolian_pub_files = \
14 lib/evas/canvas/efl_ui_clickable.eo \ 14 lib/evas/canvas/efl_ui_clickable.eo \
15 lib/evas/canvas/efl_ui_scrollable.eo \ 15 lib/evas/canvas/efl_ui_scrollable.eo \
16 lib/evas/canvas/efl_ui_selectable.eo \ 16 lib/evas/canvas/efl_ui_selectable.eo \
17 lib/evas/canvas/evas_zoomable_interface.eo \ 17 lib/evas/canvas/efl_ui_zoomable.eo \
18 lib/evas/canvas/evas_canvas3d_camera.eo\ 18 lib/evas/canvas/evas_canvas3d_camera.eo\
19 lib/evas/canvas/evas_canvas3d_texture.eo\ 19 lib/evas/canvas/evas_canvas3d_texture.eo\
20 lib/evas/canvas/evas_canvas3d_material.eo\ 20 lib/evas/canvas/evas_canvas3d_material.eo\
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index d7d1d6b719..70619e0820 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -1071,7 +1071,7 @@ _zoom_timeout_cb(void *data)
1071 _smooth_update(sd); 1071 _smooth_update(sd);
1072 sd->zoom_timer = NULL; 1072 sd->zoom_timer = NULL;
1073 eo_event_callback_call 1073 eo_event_callback_call
1074 (sd->obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); 1074 (sd->obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
1075 1075
1076 return ECORE_CALLBACK_CANCEL; 1076 return ECORE_CALLBACK_CANCEL;
1077} 1077}
@@ -1133,7 +1133,7 @@ _zoom_do(Elm_Map_Data *sd,
1133 } 1133 }
1134 else 1134 else
1135 eo_event_callback_call 1135 eo_event_callback_call
1136 (sd->obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL); 1136 (sd->obj, EFL_UI_EVENT_ZOOM_START, NULL);
1137 1137
1138 if (sd->obj) 1138 if (sd->obj)
1139 sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj); 1139 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 2ad3904505..430bbe8be7 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)
787 sd->no_smooth--; 787 sd->no_smooth--;
788 if (!sd->no_smooth) _smooth_update(data); 788 if (!sd->no_smooth) _smooth_update(data);
789 eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); 789 eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
790 eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); 790 eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
791 } 791 }
792 792
793 return EO_CALLBACK_CONTINUE; 793 return EO_CALLBACK_CONTINUE;
@@ -1103,7 +1103,7 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
1103 sd->no_smooth--; 1103 sd->no_smooth--;
1104 if (!sd->no_smooth) _smooth_update(obj); 1104 if (!sd->no_smooth) _smooth_update(obj);
1105 _zoom_do(obj, 1.0); 1105 _zoom_do(obj, 1.0);
1106 eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); 1106 eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
1107 } 1107 }
1108} 1108}
1109 1109
@@ -1966,12 +1966,12 @@ done:
1966 if (!sd->paused) 1966 if (!sd->paused)
1967 { 1967 {
1968 if (started) 1968 if (started)
1969 eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL); 1969 eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_START, NULL);
1970 if (!an) 1970 if (!an)
1971 eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); 1971 eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
1972 } 1972 }
1973 if (zoom_changed) 1973 if (zoom_changed)
1974 eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_CHANGE, NULL); 1974 eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL);
1975} 1975}
1976 1976
1977EOLIAN static double 1977EOLIAN static double
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index c064872224..2e2e61e632 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -13,7 +13,7 @@ enum Elm.Photocam.Zoom_Mode
13class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, 13class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
14 Elm.Interface.Atspi_Widget_Action, Efl.File, 14 Elm.Interface.Atspi_Widget_Action, Efl.File,
15 Efl.Ui.Clickable, Efl.Ui.Scrollable, 15 Efl.Ui.Clickable, Efl.Ui.Scrollable,
16 Evas.Zoomable_Interface) 16 Efl.Ui.Zoomable)
17{ 17{
18 legacy_prefix: elm_photocam; 18 legacy_prefix: elm_photocam;
19 eo_prefix: elm_obj_photocam; 19 eo_prefix: elm_obj_photocam;
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 2547431f4b..f04bec5a79 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -6,7 +6,7 @@
6#include "canvas/efl_ui_clickable.eo.h" 6#include "canvas/efl_ui_clickable.eo.h"
7#include "canvas/efl_ui_scrollable.eo.h" 7#include "canvas/efl_ui_scrollable.eo.h"
8#include "canvas/efl_ui_selectable.eo.h" 8#include "canvas/efl_ui_selectable.eo.h"
9#include "canvas/evas_zoomable_interface.eo.h" 9#include "canvas/efl_ui_zoomable.eo.h"
10 10
11#include "canvas/evas_canvas.eo.h" 11#include "canvas/evas_canvas.eo.h"
12 12
diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
index 0cbbd8e8e8..f2ffc24ff0 100644
--- a/src/lib/evas/canvas/common_interfaces.c
+++ b/src/lib/evas/canvas/common_interfaces.c
@@ -5,4 +5,4 @@
5#include "canvas/efl_ui_clickable.eo.c" 5#include "canvas/efl_ui_clickable.eo.c"
6#include "canvas/efl_ui_scrollable.eo.c" 6#include "canvas/efl_ui_scrollable.eo.c"
7#include "canvas/efl_ui_selectable.eo.c" 7#include "canvas/efl_ui_selectable.eo.c"
8#include "canvas/evas_zoomable_interface.eo.c" 8#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
index 5f65fa580a..325948dcfb 100644
--- a/src/lib/evas/canvas/evas_zoomable_interface.eo
+++ b/src/lib/evas/canvas/efl_ui_zoomable.eo
@@ -1,5 +1,6 @@
1interface Evas.Zoomable_Interface () 1interface Efl.Ui.Zoomable ()
2{ 2{
3 event_prefix: efl_ui;
3 events { 4 events {
4 zoom,start; 5 zoom,start;
5 zoom,stop; 6 zoom,stop;