diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-19 15:20:29 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-19 16:35:28 +0900 |
commit | d7588da0ae2a8354609f0ecf7a20d27571efa01b (patch) | |
tree | ffebf1f644ef1ec90c70c6ddbf4435c3907ea9d0 | |
parent | 2eb47dbb21fa5fa74bf15cbc7ad1a821d2f63d50 (diff) | |
download | efl-d7588da0ae2a8354609f0ecf7a20d27571efa01b.tar.gz |
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 641a58f735e93fb9e70dc85c006b3da09645bae7
See f53fe993a6a285ddb49aa69d6c6856169f37ec63
This commit unfortunately doesn't solve the issue.
-rw-r--r-- | src/lib/edje/edje_legacy.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c index 1f64609ea6..dc3ab1702f 100644 --- a/src/lib/edje/edje_legacy.c +++ b/src/lib/edje/edje_legacy.c @@ -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; |