summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-19 15:20:29 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-19 16:35:28 +0900
commitd7588da0ae2a8354609f0ecf7a20d27571efa01b (patch)
treeffebf1f644ef1ec90c70c6ddbf4435c3907ea9d0 /src/lib/edje
parent2eb47dbb21fa5fa74bf15cbc7ad1a821d2f63d50 (diff)
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.
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_legacy.c11
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)
1095EAPI void 1095EAPI void
1096edje_object_size_min_restricted_calc(Edje_Object *obj, int *minw, int *minh, int restrictedw, int restrictedh) 1096edje_object_size_min_restricted_calc(Edje_Object *obj, int *minw, int *minh, int restrictedw, int restrictedh)
1097{ 1097{
1098 Eina_Size2D sz; 1098 Eina_Size2D sz = { restrictedw, restrictedh };
1099 Edje *ed;
1100
1101 ed = _edje_fetch(obj);
1102 if (!ed)
1103 {
1104 if (minw) *minw = sz.w;
1105 if (minh) *minh = sz.h;
1106 return;
1107 }
1099 sz = efl_canvas_layout_calc_size_min(obj, EINA_SIZE2D(restrictedw, restrictedh)); 1108 sz = efl_canvas_layout_calc_size_min(obj, EINA_SIZE2D(restrictedw, restrictedh));
1100 if (minw) *minw = sz.w; 1109 if (minw) *minw = sz.w;
1101 if (minh) *minh = sz.h; 1110 if (minh) *minh = sz.h;