vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert this commit to fix the problem by the other method. 

Revert "Small bug. In some case, the box cannot be proper size."

This reverts commit ca95166f9a8cb7db8c1557d75f444d76772b2176.
This commit is contained in:
Jaehwan Kim 2013-03-05 15:46:30 +09:00
parent 962b965563
commit 621775dad2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -486,14 +486,14 @@ _resize_job(void *data)
if (sd->vertical)
{
if (h >= vh) _items_size_fit(obj, &h, vh);
if (h > vh) _items_size_fit(obj, &h, vh);
if (sd->item_count - sd->separator_count > 0)
eo_do(obj, elm_scrollable_interface_paging_set
(0.0, 0.0, 0, (h / (sd->item_count - sd->separator_count))));
}
else
{
if (w >= vw) _items_size_fit(obj, &w, vw);
if (w > vw) _items_size_fit(obj, &w, vw);
if (sd->item_count - sd->separator_count > 0)
eo_do(obj, elm_scrollable_interface_paging_set
(0.0, 0.0, (w / (sd->item_count - sd->separator_count)), 0));
@ -950,13 +950,13 @@ _sizing_eval(Evas_Object *obj)
if (sd->vertical)
{
minw = minw_bx + (w - vw);
if (minh_bx < vh) minh_bx = vh;
if (minh_bx <= vh) minh_bx = vh;
else _items_size_fit(obj, &minh_bx, vh);
}
else
{
minh = minh_bx + (h - vh);
if (minw_bx < vw) minw_bx = vw;
if (minw_bx <= vw) minw_bx = vw;
else _items_size_fit(obj, &minw_bx, vw);
}
}