From 94f83f6519e9a8406943ed3c0154f4013030d432 Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Wed, 28 Dec 2011 15:27:25 +0900 Subject: [PATCH] [Map] Merge upstream r66585, r66560 Change-Id: I83c3b32161c851708c38cd17f1595f49a0703d75 r66585: When map is paused by using elm_map_paused_set(), all existing animations is stopped. r66560: trivial change. --- src/lib/elm_map.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index eaabb99..519caff 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -3380,7 +3380,7 @@ elm_map_paused_set(Evas_Object *obj, Eina_Bool paused) if (!wd) return; if (wd->paused == !!paused) return; - wd->paused = paused; + wd->paused = !!paused; if (wd->paused) { if (wd->zoom_animator) @@ -3390,6 +3390,14 @@ elm_map_paused_set(Evas_Object *obj, Eina_Bool paused) zoom_do(obj); evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL); } + edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), + "elm,state,busy,stop", "elm"); + } + else + { + if (wd->download_num >= 1) + edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), + "elm,state,busy,start", "elm"); } #else (void) obj; -- 2.7.4