ami pushed a commit to branch efl-1.18.
http://git.enlightenment.org/core/efl.git/commit/?id=d48d326f852c7fee6ce200a4161d721db790c21a
commit d48d326f852c7fee6ce200a4161d721db790c21a
Author: Minkyu Kang <mk7.k...@samsung.com>
Date: Tue Feb 21 15:02:30 2017 +0530
elementary gengrid: fix for working item reorder mode correctly
Summary:
Change the item indexing to start 1 after reordering animation.
Change the logic of edge checking to get the row or col correctly.
Signed-off-by: Minkyu Kang <mk7.k...@samsung.com>
Test Plan:
elementary_test -to gengrid2
append 6 items
enable the reorder mode
check reordering is working properly (4 to 1)
@fix
Reviewers: singh.amitesh, cedric
Subscribers: jehun.lim, jpeg
Differential Revision: https://phab.enlightenment.org/D4676
---
src/lib/elementary/elm_gengrid.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 84cca83..df6c3d2 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -2542,7 +2542,7 @@ _elm_gengrid_item_edge_check(Elm_Object_Item *eo_it,
{
row = cvh / sd->item_height;
if (row <= 0) row = 1;
- col = tmp->position / row;
+ col = (tmp->position - 1) / row;
if (col == 0)
return EINA_TRUE;
}
@@ -2550,7 +2550,7 @@ _elm_gengrid_item_edge_check(Elm_Object_Item *eo_it,
{
col = cvw / sd->item_width;
if (col <= 0) col = 1;
- row = tmp->position / col;
+ row = (tmp->position - 1) / col;
if (row == 0)
return EINA_TRUE;
}
@@ -2788,7 +2788,7 @@ _anim_end(Elm_Gengrid_Data *sd)
EINA_INLIST_GET(sd->reorder.it2));
}
}
- _item_position_update(sd->items, 0);
+ _item_position_update(sd->items, 1);
ecore_job_del(sd->calc_job);
sd->calc_job = ecore_job_add(_calc_job, sd->obj);
--
