enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elm/map: move setting initial zoom to later in construction 

Summary:
this ensures that all necessary objects exist in order to successfully
perform the zoom

@fix
Depends on D8999

Reviewers: cedric

Reviewed By: cedric

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D9000
This commit is contained in:
Mike Blumenkrantz 2019-05-29 09:31:17 -04:00
parent 3ef9e5ac4c
commit f65ffd257b
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1159,16 +1159,13 @@ _zoom_do(Elm_Map_Data *sd,
ecore_timer_del(sd->zoom_timer);
sd->zoom_timer = NULL;
}
else if (sd->obj)
else
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_ZOOM_START, NULL);
if (sd->obj)
{
sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL);
}
sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL);
efl_event_callback_legacy_call
(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
@ -4184,8 +4181,6 @@ _elm_map_efl_canvas_group_group_add(Eo *obj, Elm_Map_Data *priv)
id_num++;
_grid_all_create(priv);
_zoom_do(priv, 0);
priv->mode = EFL_UI_ZOOM_MODE_MANUAL;
if (!elm_need_efreet())
@ -4322,6 +4317,7 @@ _elm_map_efl_object_constructor(Eo *obj, Elm_Map_Data *sd)
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP);
legacy_object_focus_handle(obj);
_zoom_do(sd, 0);
return obj;
}