enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

elm_interface_scrollable: fix wanted coordinate calculation 

Summary:
boundary check of _elm_scroll_wanted_coordinates_update() is wrong.
boundary was checked with assumption that 0, 0 is top, left
however, 0, 0 could be different according to usages, in case of gengrid, 0, 0 was center left not top left)

Do not assume the min/max value, but use pan min/max value for boundary check

Fixes T1092

Test Plan: elementary_test -> grid -> uncheck multi select mode -> select first item -> click bring in -> resize window

Reviewers: raster, woohyun, seoz, zmike

CC: seoz

Maniphest Tasks: T1092

Differential Revision: https://phab.enlightenment.org/D720
This commit is contained in:
wonguk.jeong 2014-04-21 15:06:28 +09:00 committed by Carsten Haitzler (Rasterman)
parent a4f3729da0
commit e1ea913a22
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -1198,27 +1198,26 @@ _elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid,
Evas_Coord x,
Evas_Coord y)
{
Evas_Coord cw, ch;
Evas_Coord mx = 0, my = 0, minx = 0, miny = 0;
if (!sid->pan_obj) return;
eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, &ch));
eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
/* Update wx/y/w/h - and if the requested positions aren't legal
* adjust a bit. */
eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
(NULL, NULL, &sid->ww, &sid->wh));
if (x < 0)
sid->wx = 0;
else if ((x + sid->ww) > cw)
sid->wx = cw - sid->ww;
if (x < minx) sid->wx = minx;
else if (x > mx) sid->wx = mx;
else if (sid->is_mirrored)
sid->wx = _elm_scroll_x_mirrored_get(sid->obj, x);
else
sid->wx = x;
if (y < 0) sid->wy = 0;
else if ((y + sid->wh) > ch)
sid->wy = ch - sid->wh;
else sid->wx = x;
if (y < miny) sid->wy = miny;
else if (y > my) sid->wy = my;
else sid->wy = y;
}