From 37e87322481fb3fa1ba7a27acb59f14f37a00904 Mon Sep 17 00:00:00 2001 From: gouache Date: Wed, 27 Apr 2011 06:04:04 +0000 Subject: [PATCH] elm_map: fix pinch zoom bug git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@58946 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_map.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 72901e1..c7fd2d7 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -1595,15 +1595,13 @@ _mouse_multi_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *eve elm_smart_scroller_hold_set(wd->scr, 1); elm_smart_scroller_freeze_set(wd->scr, 1); - if ((wd->multi_count + 1) > 1) goto done; - else wd->multi_count++; - ev = create_event_object(data, obj, down->device); if (!ev) { DBG("Failed : create_event_object"); goto done; } + wd->multi_count++; ev->hold_timer = NULL; ev->start.x = ev->prev.x = down->output.x; @@ -1638,7 +1636,7 @@ _mouse_multi_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__ ev0 = get_event_object(data, 0); if (!ev0) return; - if (wd->multi_count == 1) + if (wd->multi_count >= 1) { Evas_Coord x, y, w, h; float half_w, half_h; -- 2.7.4