From f65ffd257b60045fc9adf61498457209847f019b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 29 May 2019 09:31:17 -0400 Subject: [PATCH] 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 --- src/lib/elementary/elm_map.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 7c0229b0df..ab6da777d0 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -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; }