summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2017-02-21 15:02:30 +0530
committerAmitesh Singh <amitesh.sh@samsung.com>2017-02-23 11:39:12 +0530
commitd48d326f852c7fee6ce200a4161d721db790c21a (patch)
tree5e89bec4a2b3b98c10d65fcf96c0f81246887c52
parent3c5d814da688f2f4515d8f4eec9411b5cf3583bb (diff)
downloadefl-d48d326f852c7fee6ce200a4161d721db790c21a.tar.gz
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.kang@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
-rw-r--r--src/lib/elementary/elm_gengrid.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 84cca831cd..df6c3d2e74 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);