discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f15e1236a4364fd68462745c5d23764bd695763f
commit f15e1236a4364fd68462745c5d23764bd695763f Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 Efl.Ui.Zoom: zoom -> zoom_level --- src/bin/elementary/test_photocam.c | 4 ++-- src/lib/efl/interfaces/efl_ui_zoom.eo | 4 ++-- src/lib/elementary/efl_ui_image_zoomable.c | 8 ++++---- src/lib/elementary/efl_ui_image_zoomable.eo | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c index 58e34e1a31..0e8e2dea53 100644 --- 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 327c34d5e6..8c602a455f 100644 --- 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 bd9dc5cafe..bae6834b61 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -2226,7 +2226,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; @@ -2454,7 +2454,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; } @@ -3145,13 +3145,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 32e2025ab9..434af0e4a7 100644 --- 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; --
