summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2014-05-14 12:27:27 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-05-14 12:27:27 +0900
commit7592d9507682c3521d5d90357b1944d584bdd24f (patch)
treef5967d6cf9c98f0ee5ecdf2fa296e61a9fd628b2 /src/lib
parentd23c37169f4e613d10b0fb41e474d2ed1b521b68 (diff)
elm_map: Fix to show and bring in a correct region after zooming
Summary: Show and bring in a region which has the given latitude and longitude after zooming @fix Reviewers: Hermet CC: seoz Differential Revision: https://phab.enlightenment.org/D851
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elm_map.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 5b32b5546..b352b5233 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1012,21 +1012,24 @@ _track_place(Elm_Map_Data *sd)
1012static void 1012static void
1013_calc_job(Elm_Map_Data *sd) 1013_calc_job(Elm_Map_Data *sd)
1014{ 1014{
1015 if (sd->calc_job.region_show_bring_in)
1016 {
1017 sd->calc_job.region_show_bring_in
1018 (sd, sd->calc_job.lon, sd->calc_job.lat, sd->calc_job.bring_in);
1019 sd->calc_job.region_show_bring_in = NULL;
1020 }
1021 if (sd->calc_job.zoom_mode_set) 1015 if (sd->calc_job.zoom_mode_set)
1022 { 1016 {
1023 sd->calc_job.zoom_mode_set(sd, sd->calc_job.zoom); 1017 sd->calc_job.zoom_mode_set(sd, sd->calc_job.zoom);
1024 sd->calc_job.zoom_mode_set = NULL; 1018 sd->calc_job.zoom_mode_set = NULL;
1025 } 1019 }
1026 if (sd->calc_job.overlays_show) 1020 if (!sd->zoom_animator)
1027 { 1021 {
1028 sd->calc_job.overlays_show(sd, sd->calc_job.overlays); 1022 if (sd->calc_job.region_show_bring_in)
1029 sd->calc_job.overlays_show = NULL; 1023 {
1024 sd->calc_job.region_show_bring_in
1025 (sd, sd->calc_job.lon, sd->calc_job.lat, sd->calc_job.bring_in);
1026 sd->calc_job.region_show_bring_in = NULL;
1027 }
1028 if (sd->calc_job.overlays_show)
1029 {
1030 sd->calc_job.overlays_show(sd, sd->calc_job.overlays);
1031 sd->calc_job.overlays_show = NULL;
1032 }
1030 } 1033 }
1031} 1034}
1032 1035
@@ -1136,6 +1139,7 @@ _zoom_anim_cb(void *data)
1136 { 1139 {
1137 sd->zoom_animator = NULL; 1140 sd->zoom_animator = NULL;
1138 evas_object_smart_changed(sd->pan_obj); 1141 evas_object_smart_changed(sd->pan_obj);
1142 _calc_job(sd);
1139 1143
1140 return ECORE_CALLBACK_CANCEL; 1144 return ECORE_CALLBACK_CANCEL;
1141 } 1145 }