diff options
| author | davemds <dave@gurumeditation.it> | 2014-08-09 15:47:59 +0200 |
|---|---|---|
| committer | davemds <dave@gurumeditation.it> | 2014-08-09 15:47:59 +0200 |
| commit | 71c46f7aad35a4fa4ef22c5f335d835fae82363c (patch) | |
| tree | bab01d6c1a8453ecbff049ab931d42ff839c277c | |
| parent | 4b52eaa37af7d3585a5b3870e90d28117d613543 (diff) | |
| download | elementary-71c46f7aad35a4fa4ef22c5f335d835fae82363c.tar.gz | |
Gengrid: fix position calculation
@fix
To calc the position in a table you need to make the modulo of the col/row size, not the modulo on the x/y value
This unbreak the elm_gengrid_item_pos_get() function that was reporting wrong values
| -rw-r--r-- | src/lib/elm_gengrid.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 120adb8a1..08b6c728e 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -173,8 +173,7 @@ _item_show_region(void *data) row = cvh / sd->item_height; if (row <= 0) row = 1; x = (it->position - 1) / row; - if (x == 0) y = it->position - 1; - else if (x > 0) y = (it->position - 1) % x; + y = (it->position - 1) % row; if (x >= 1) it_xpos = ((x - GG_IT(it)->prev_group) * sd->item_width) + (GG_IT(it)->prev_group * sd->group_item_width) @@ -189,10 +188,10 @@ _item_show_region(void *data) else if (sd->item_width > 0) { col = cvw / sd->item_width; + if (col <= 0) col = 1; y = (it->position - 1) / col; - if (y == 0) x = it->position - 1; - else if (y > 0) x = (it->position - 1) % y; + x = (it->position - 1) % col; it_xpos = x * sd->item_width + minx; if (y >= 1) it_ypos = ((y - GG_IT(it)->prev_group) * sd->item_height) |