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

edje: Ensure min size calc is always >= restricted 

We're not 100% sure yet but there seems to be an issue with GCC and -O2
where rage scrolling doesn't work anymore, since the first patch below:

See 641a58f735
See f53fe993a6

This commit unfortunately doesn't solve the issue.
This commit is contained in:
Jean-Philippe Andre 2017-09-19 15:20:29 +09:00
parent 2eb47dbb21
commit d7588da0ae
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/edje/edje_legacy.c
View File

@ -1095,7 +1095,16 @@ edje_object_size_min_calc(Edje_Object *obj, int *minw, int *minh)
EAPI void
edje_object_size_min_restricted_calc(Edje_Object *obj, int *minw, int *minh, int restrictedw, int restrictedh)
{
Eina_Size2D sz;
Eina_Size2D sz = { restrictedw, restrictedh };
Edje *ed;
ed = _edje_fetch(obj);
if (!ed)
{
if (minw) *minw = sz.w;
if (minh) *minh = sz.h;
return;
}
sz = efl_canvas_layout_calc_size_min(obj, EINA_SIZE2D(restrictedw, restrictedh));
if (minw) *minw = sz.w;
if (minh) *minh = sz.h;