summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-06 13:22:05 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-06 13:02:43 -0800
commit21b0467e6ff6f8d043cc4b3cf0e8758a162f51f6 (patch)
treebc9c4a75838df1c0dc01dd38411c9e03ce9c7071 /src
parentc7b27506eacb86e44bbc9b6c27b9ee84b340d6a8 (diff)
elm_photocam: remove linkage with efl_ui_zoom
this is a legacy class and should not have its enum values defined to an interface enum Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8122
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c6
-rw-r--r--src/lib/elementary/elm_photocam_legacy.h18
2 files changed, 13 insertions, 11 deletions
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index fd25b6f864..609c85fe9f 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -2648,10 +2648,10 @@ _efl_ui_image_zoomable_efl_ui_zoom_zoom_level_get(const Eo *obj EINA_UNUSED, Efl
2648} 2648}
2649 2649
2650EOLIAN static void 2650EOLIAN static void
2651_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Elm_Photocam_Zoom_Mode mode) 2651_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Efl_Ui_Zoom_Mode mode)
2652{ 2652{
2653 double tz; 2653 double tz;
2654 if (sd->mode == mode) return; 2654 if (sd->mode == (Elm_Photocam_Zoom_Mode)mode) return;
2655 sd->mode = mode; 2655 sd->mode = mode;
2656 2656
2657 tz = sd->zoom; 2657 tz = sd->zoom;
@@ -2659,7 +2659,7 @@ _efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, Efl_Ui_Image_Zoomable_
2659 elm_photocam_zoom_set(obj, tz); 2659 elm_photocam_zoom_set(obj, tz);
2660} 2660}
2661 2661
2662EOLIAN static Elm_Photocam_Zoom_Mode 2662EOLIAN static Efl_Ui_Zoom_Mode
2663_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd) 2663_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
2664{ 2664{
2665 return sd->mode; 2665 return sd->mode;
diff --git a/src/lib/elementary/elm_photocam_legacy.h b/src/lib/elementary/elm_photocam_legacy.h
index b56f8b018b..52a3cbd1d9 100644
--- a/src/lib/elementary/elm_photocam_legacy.h
+++ b/src/lib/elementary/elm_photocam_legacy.h
@@ -1,5 +1,3 @@
1#include "interfaces/efl_ui_zoom.eo.legacy.h"
2
3typedef Eo Elm_Photocam; 1typedef Eo Elm_Photocam;
4 2
5/** 3/**
@@ -180,13 +178,17 @@ EAPI void elm_photocam_zoom_set(Evas_Object *obj, double zoom);
180 */ 178 */
181EAPI double elm_photocam_zoom_get(const Evas_Object *obj); 179EAPI double elm_photocam_zoom_get(const Evas_Object *obj);
182 180
183typedef Efl_Ui_Zoom_Mode Elm_Photocam_Zoom_Mode;
184 181
185#define ELM_PHOTOCAM_ZOOM_MODE_MANUAL EFL_UI_ZOOM_MODE_MANUAL 182typedef enum
186#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT EFL_UI_ZOOM_MODE_AUTO_FIT 183{
187#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL EFL_UI_ZOOM_MODE_AUTO_FILL 184 ELM_PHOTOCAM_ZOOM_MODE_MANUAL = 0, /**< Zoom controlled normally by elm_photocam_zoom_set */
188#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN EFL_UI_ZOOM_MODE_AUTO_FIT_IN 185 ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT, /**< Zoom until photo fits in zoomable object */
189#define ELM_PHOTOCAM_ZOOM_MODE_LAST EFL_UI_ZOOM_MODE_LAST 186 ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL, /**< Zoom until photo fills zoomable object */
187 ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN, /**< Zoom in until photo fits in zoomable object
188 */
189 ELM_PHOTOCAM_ZOOM_MODE_LAST /**< Sentinel value to indicate last enum field during
190 * iteration */
191} Elm_Photocam_Zoom_Mode;
190 192
191/** 193/**
192 * @brief Set the zoom mode 194 * @brief Set the zoom mode