Efl.Ui.Zoom: zoom -> zoom_level

diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 58e34e1..0e8e2de 100644 (file)
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -777,7 +777,7 @@ _zoomable_mouse_wheel_cb(void *data, const Efl_Event *e)
    Efl_Input_Pointer *ev = e->info;
    int zoom, _zoom, delta, val;
 
-   zoom = efl_ui_zoom_get(zoomable);
+   zoom = efl_ui_zoom_level_get(zoomable);
    delta = efl_input_pointer_wheel_delta_get(ev);
    if ((delta > 0) && (zoom == 1)) return;
 
@@ -795,7 +795,7 @@ _zoomable_mouse_wheel_cb(void *data, const Efl_Event *e)
      }
 
    efl_ui_zoom_mode_set(zoomable, EFL_UI_ZOOM_MODE_MANUAL);
-   if (zoom >= 1) efl_ui_zoom_set(zoomable, zoom);
+   if (zoom >= 1) efl_ui_zoom_level_set(zoomable, zoom);
 }
 
 void

diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo
index 327c34d..8c602a4 100644 (file)
--- a/src/lib/efl/interfaces/efl_ui_zoom.eo
+++ b/src/lib/efl/interfaces/efl_ui_zoom.eo
@@ -36,7 +36,7 @@ interface Efl.Ui.Zoom ()
             paused: bool; [[The pause state.]]
          }
       }
-      @property zoom {
+      @property zoom_level {
          set {
             [[Set the zoom level of the photo
 
@@ -70,7 +70,7 @@ interface Efl.Ui.Zoom ()
 
               This sets the zoom mode to manual or one of several automatic
               levels. Manual (EFL_UI_ZOOM_MODE_MANUAL) means that zoom
-              is set manually by @.zoom.set and will stay at that level until
+              is set manually by @.zoom_level.set and will stay at that level until
               changed by code or until zoom mode is changed. This is the
               default mode. The Automatic modes will allow the zoomable object
               to automatically adjust zoom mode based on properties.

diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index c3885b2..a3b763c 100644 (file)
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -2239,7 +2239,7 @@ _efl_ui_image_zoomable_efl_file_file_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zooma
 }
 
 EOLIAN static void
-_efl_ui_image_zoomable_efl_ui_zoom_zoom_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, double zoom)
+_efl_ui_image_zoomable_efl_ui_zoom_zoom_level_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, double zoom)
 {
    double z;
    Eina_List *l;
@@ -2467,7 +2467,7 @@ done:
 }
 
 EOLIAN static double
-_efl_ui_image_zoomable_efl_ui_zoom_zoom_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
+_efl_ui_image_zoomable_efl_ui_zoom_zoom_level_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
 {
    return sd->zoom;
 }
@@ -3159,13 +3159,13 @@ elm_photocam_paused_set(Evas_Object *obj, Eina_Bool paused)
 EAPI void
 elm_photocam_zoom_set(Evas_Object *obj, double zoom)
 {
-   efl_ui_zoom_set(obj, zoom);
+   efl_ui_zoom_level_set(obj, zoom);
 }
 
 EAPI double
 elm_photocam_zoom_get(const Evas_Object *obj)
 {
-   return efl_ui_zoom_get(obj);
+   return efl_ui_zoom_level_get(obj);
 }
 
 EAPI void

diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 32e2025..434af0e 100644 (file)
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -55,7 +55,7 @@ class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
       Efl.Player.playable { get; }
       Efl.Player.play { get; set; }
       Efl.Ui.Zoom.zoom_animation { set; get; }
-      Efl.Ui.Zoom.zoom { set; get; }
+      Efl.Ui.Zoom.zoom_level { set; get; }
       Efl.Ui.Zoom.zoom_mode { set; get; }
       Efl.Canvas.Group.group_member_add;
       Efl.Ui.Widget.theme_apply;