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

elm_map: convert enums correctly 

Summary:
ensure that everything stays in the allowed and previously used ranges.
The enums that are passed here are not equivalent.
Depends on D6382

Reviewers: devilhorns, zmike

Reviewed By: zmike

Subscribers: cedric, #committers, zmike

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D6383
This commit is contained in:
Marcel Hollerbach 2018-06-25 06:56:42 -04:00 committed by Mike Blumenkrantz
parent d714c21ecb
commit 7305051197
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/lib/elementary/elm_map.c
View File

@ -4346,16 +4346,49 @@ _elm_map_efl_ui_zoom_zoom_mode_set(Eo *obj, Elm_Map_Data *sd, Efl_Ui_Zoom_Mode m
efl_ui_zoom_mode_set(efl_super(obj, MY_CLASS), mode);
}
static inline void
_convert_map_zoom_mode(Elm_Map_Zoom_Mode *legacy_mode, Efl_Ui_Zoom_Mode *mode, Eina_Bool to_legacy)
{
#define CONVERT(LEGACY_MODE, NEW_MODE) \
if (to_legacy && *mode == NEW_MODE) \
{ \
*legacy_mode =LEGACY_MODE; \
return; \
} \
if (!to_legacy && *legacy_mode == LEGACY_MODE) \
{ \
*mode = NEW_MODE; \
return; \
} \
CONVERT(ELM_MAP_ZOOM_MODE_MANUAL, EFL_UI_ZOOM_MODE_MANUAL)
CONVERT(ELM_MAP_ZOOM_MODE_AUTO_FIT, EFL_UI_ZOOM_MODE_AUTO_FIT)
CONVERT(ELM_MAP_ZOOM_MODE_AUTO_FILL, EFL_UI_ZOOM_MODE_AUTO_FILL)
CONVERT(ELM_MAP_ZOOM_MODE_LAST, EFL_UI_ZOOM_MODE_LAST)
CONVERT(ELM_MAP_ZOOM_MODE_LAST, EFL_UI_ZOOM_MODE_AUTO_FIT_IN)
#undef CONVERT
}
EAPI void
elm_map_zoom_mode_set(Eo *obj, Elm_Map_Zoom_Mode mode)
{
efl_ui_zoom_mode_set(obj, mode);
Efl_Ui_Zoom_Mode new_mode;
_convert_map_zoom_mode(&mode, &new_mode, EINA_FALSE);
efl_ui_zoom_mode_set(obj, new_mode);
}
EAPI Elm_Map_Zoom_Mode
elm_map_zoom_mode_get(const Eo *obj)
{
return efl_ui_zoom_mode_get(obj);
Efl_Ui_Zoom_Mode new_mode = efl_ui_zoom_mode_get(obj);;
Elm_Map_Zoom_Mode mode;
_convert_map_zoom_mode(&mode, &new_mode, EINA_TRUE);
return mode;
}
EOLIAN static void