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

elm_web: convert the enum fields correctly, as previously done 

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

Reviewers: devilhorns, zmike

Reviewed By: zmike

Subscribers: cedric, #committers, zmike

Tags: #efl

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

38
src/lib/elementary/elm_web2.c
View File

@ -157,16 +157,50 @@ elm_web_window_features_region_get(const Elm_Web_Window_Features *wf,
ewm.window_features_region_get(wf, x, y, w, h);
}
static inline void
_convert_web_zoom_mode(Elm_Web_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_WEB_ZOOM_MODE_MANUAL, EFL_UI_ZOOM_MODE_MANUAL)
CONVERT(ELM_WEB_ZOOM_MODE_AUTO_FIT, EFL_UI_ZOOM_MODE_AUTO_FIT)
CONVERT(ELM_WEB_ZOOM_MODE_AUTO_FILL, EFL_UI_ZOOM_MODE_AUTO_FILL)
CONVERT(ELM_WEB_ZOOM_MODE_LAST, EFL_UI_ZOOM_MODE_LAST)
CONVERT(ELM_WEB_ZOOM_MODE_LAST, EFL_UI_ZOOM_MODE_AUTO_FIT_IN)
#undef CONVERT
}
EAPI void
elm_web_zoom_mode_set(Evas_Object *obj, Elm_Web_Zoom_Mode mode)
{
efl_ui_zoom_mode_set(obj, mode);
Efl_Ui_Zoom_Mode new_mode;
_convert_web_zoom_mode(&mode, &new_mode, EINA_FALSE);
efl_ui_zoom_mode_set(obj, new_mode);
}
EAPI Elm_Web_Zoom_Mode
elm_web_zoom_mode_get(const Evas_Object *obj)
{
return efl_ui_zoom_mode_get(obj);
Efl_Ui_Zoom_Mode new_mode = efl_ui_zoom_mode_get(obj);;
Elm_Web_Zoom_Mode mode;
_convert_web_zoom_mode(&mode, &new_mode, EINA_TRUE);
return mode;
}
EAPI void