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

work when items are bigger than viewport. 

rfonseca, be careful with corner cases... and PLEASE ADD SPACES!!!! it's awful to read (a*b)/c+d/e...



SVN revision: 53225
This commit is contained in:
Gustavo Sverzut Barbieri 2010-10-09 01:42:32 +00:00
parent 17dfe16715
commit 6037fde0dd
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -949,31 +949,39 @@ _item_place(Elm_Gengrid_Item *item, Evas_Coord cx, Evas_Coord cy)
cvw = vw + 2 * PRELOAD * item->wd->item_width; cvw = vw + 2 * PRELOAD * item->wd->item_width;
cvh = vh + 2 * PRELOAD * item->wd->item_height; cvh = vh + 2 * PRELOAD * item->wd->item_height;
tch = ((vh/item->wd->item_height)*item->wd->item_height); tch = (vh * item->wd->item_height) / item->wd->item_height;
alignh = (vh - tch)*item->wd->align_y; alignh = (vh - tch) * item->wd->align_y;
tcw = ((vw/item->wd->item_width)*item->wd->item_width); tcw = (vw * item->wd->item_width) / item->wd->item_width;
alignw = (vw - tcw)*item->wd->align_x; alignw = (vw - tcw) * item->wd->align_x;
if ((item->wd->horizontal) && (item->wd->minw < vw)) if ((item->wd->horizontal) && (item->wd->minw < vw))
{ {
int columns; int columns, items_visible;
columns = eina_list_count(item->wd->items)/(vh/item->wd->item_height); items_visible = vh / item->wd->item_height;
if (eina_list_count(item->wd->items) % (vh/item->wd->item_height)) if (items_visible < 1)
items_visible = 1;
columns = eina_list_count(item->wd->items) / items_visible;
if (eina_list_count(item->wd->items) % items_visible)
columns++; columns++;
tcw = item->wd->item_width * columns; tcw = item->wd->item_width * columns;
alignw = (vw - tcw)*item->wd->align_x; alignw = (vw - tcw) * item->wd->align_x;
} }
else if ((item->wd->horizontal) && (item->wd->minw > vw)) else if ((item->wd->horizontal) && (item->wd->minw > vw))
alignw = 0; alignw = 0;
if ((!item->wd->horizontal) && (item->wd->minh < vh)) if ((!item->wd->horizontal) && (item->wd->minh < vh))
{ {
int rows; int rows, items_visible;
rows = eina_list_count(item->wd->items)/(vw/item->wd->item_width); items_visible = vw / item->wd->item_width;
if (eina_list_count(item->wd->items) % (vw/item->wd->item_width)) if (items_visible < 1)
items_visible = 1;
rows = eina_list_count(item->wd->items)/ items_visible;
if (eina_list_count(item->wd->items) % items_visible)
rows++; rows++;
tch = item->wd->item_height * rows; tch = item->wd->item_height * rows;
@ -1083,19 +1091,19 @@ _calc_job(void *data)
else if (wd->item_width) else if (wd->item_width)
nmax = cvw / wd->item_width; nmax = cvw / wd->item_width;
if (nmax) if (nmax < 1)
nmax = 1;
count = eina_list_count(wd->items);
if (wd->horizontal)
{ {
count = eina_list_count(wd->items); minw = ceil(count / (float)nmax) * wd->item_width;
if (wd->horizontal) minh = nmax * wd->item_height;
{ }
minw = ceil(count / (float)nmax) * wd->item_width; else
minh = nmax * wd->item_height; {
} minw = nmax * wd->item_width;
else minh = ceil(count / (float)nmax) * wd->item_height;
{
minw = nmax * wd->item_width;
minh = ceil(count / (float)nmax) * wd->item_height;
}
} }
if ((minw != wd->minw) || (minh != wd->minh)) if ((minw != wd->minw) || (minh != wd->minh))