From 635864441f684984305cf9f1cc9a6850604ac360 Mon Sep 17 00:00:00 2001 From: gouache Date: Wed, 11 May 2011 07:27:48 +0000 Subject: [PATCH] Elementary map: warn-- & fix pinch zoom-out resolution git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@59318 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_map.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index d0a74e3..c4c1f91 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -1793,8 +1793,8 @@ _mouse_multi_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__ tt = wd->pinch.diff; wd->pinch.diff = (double)(ev->pinch_dis - ev->pinch_start_dis); t = (wd->pinch.diff * 0.01) + 1.0; - if ((!wd->zoom) || ((wd->zoom + (int)t - 1) <= s->zoom_min) || - ((wd->zoom + (int)t - 1) >= s->zoom_max) || + if (((wd->zoom + (int)t - 1) < s->zoom_min) || + ((wd->zoom + (int)t - 1) > s->zoom_max) || (t > PINCH_ZOOM_MAX) || (t < PINCH_ZOOM_MIN)) { wd->pinch.diff = tt; @@ -1837,7 +1837,7 @@ _mouse_multi_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, Event *ev0; Event *ev; Eina_Bool tp; - int zoom; + int zoom = 0; wd->multi_count--; if (wd->calc_job) ecore_job_del(wd->calc_job); @@ -1849,7 +1849,7 @@ _mouse_multi_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, tp = wd->paused; wd->paused = EINA_TRUE; if (wd->pinch.diff >= 0.0) zoom = (int)ceil((wd->pinch.diff * 0.01) - 1.0); - else if (wd->pinch.diff < 0.0) zoom = (int)floor(-1.0 / ((wd->pinch.diff * 0.01) + 1.0)); + else if (wd->pinch.diff < 0.0) zoom = (int)floor(-1.0 / ((wd->pinch.diff * 0.005) + 1.0)); elm_map_zoom_set(data, wd->zoom + zoom); wd->pinch.level = 1.0; wd->paused = tp; -- 2.7.4