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

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
This commit is contained in:
Mike Blumenkrantz 2019-03-06 13:22:05 -05:00 committed by Cedric BAIL
parent c7b27506ea
commit 21b0467e6f
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/elementary/efl_ui_image_zoomable.c
View File

@ -2648,10 +2648,10 @@ _efl_ui_image_zoomable_efl_ui_zoom_zoom_level_get(const Eo *obj EINA_UNUSED, Efl
}
EOLIAN static void
_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Elm_Photocam_Zoom_Mode mode)
_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Efl_Ui_Zoom_Mode mode)
{
double tz;
if (sd->mode == mode) return;
if (sd->mode == (Elm_Photocam_Zoom_Mode)mode) return;
sd->mode = mode;
tz = sd->zoom;
@ -2659,7 +2659,7 @@ _efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, Efl_Ui_Image_Zoomable_
elm_photocam_zoom_set(obj, tz);
}
EOLIAN static Elm_Photocam_Zoom_Mode
EOLIAN static Efl_Ui_Zoom_Mode
_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
{
return sd->mode;

18
src/lib/elementary/elm_photocam_legacy.h
View File

@ -1,5 +1,3 @@
#include "interfaces/efl_ui_zoom.eo.legacy.h"
typedef Eo Elm_Photocam;
/**
@ -180,13 +178,17 @@ EAPI void elm_photocam_zoom_set(Evas_Object *obj, double zoom);
*/
EAPI double elm_photocam_zoom_get(const Evas_Object *obj);
typedef Efl_Ui_Zoom_Mode Elm_Photocam_Zoom_Mode;
#define ELM_PHOTOCAM_ZOOM_MODE_MANUAL EFL_UI_ZOOM_MODE_MANUAL
#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT EFL_UI_ZOOM_MODE_AUTO_FIT
#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL EFL_UI_ZOOM_MODE_AUTO_FILL
#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN EFL_UI_ZOOM_MODE_AUTO_FIT_IN
#define ELM_PHOTOCAM_ZOOM_MODE_LAST EFL_UI_ZOOM_MODE_LAST
typedef enum
{
ELM_PHOTOCAM_ZOOM_MODE_MANUAL = 0, /**< Zoom controlled normally by elm_photocam_zoom_set */
ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT, /**< Zoom until photo fits in zoomable object */
ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL, /**< Zoom until photo fills zoomable object */
ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN, /**< Zoom in until photo fits in zoomable object
*/
ELM_PHOTOCAM_ZOOM_MODE_LAST /**< Sentinel value to indicate last enum field during
* iteration */
} Elm_Photocam_Zoom_Mode;
/**
* @brief Set the zoom mode