From ce68f6032932c15fce43f66cf4e03061b91ba97f Mon Sep 17 00:00:00 2001 From: tasn Date: Mon, 31 Jan 2011 10:23:56 +0000 Subject: [PATCH] Elementary: applied 56579 on region_show (that commit already applied on bring_in). git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@56584 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/els_scroller.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c index 21fb8aa..4d85ff2 100644 --- a/src/lib/els_scroller.c +++ b/src/lib/els_scroller.c @@ -944,19 +944,11 @@ _elm_smart_scroller_child_region_show_internal(Evas_Object *obj, Evas_Coord x, E sd->pan_func.get(sd->pan_obj, &px, &py); nx = px; - if (x < px) nx = x; - else if ((x + w) > (px + (cw - mx))) - { - nx = x + w - (cw - mx); - if (nx > x) nx = x; - } + if ((x < px) && ((x + w) < (px + (cw - mx)))) nx = x; + else if ((x > px) && ((x + w) > (px + (cw - mx)))) nx = x + w - (cw - mx); ny = py; - if (y < py) ny = y; - else if ((y + h) > (py + (ch - my))) - { - ny = y + h - (ch - my); - if (ny > y) ny = y; - } + if ((y < py) && ((y + h) < (py + (ch - my)))) ny = y; + else if ((y > py) && ((y + h) > (py + (ch - my)))) ny = y + h - (ch - my); if (!internal_call) { sd->wx = x; -- 2.7.4