discomfitor pushed a commit to branch enlightenment-0.21. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0adffef016f519d98985feaf2fa30390868173ef
commit 0adffef016f519d98985feaf2fa30390868173ef Author: Mike Blumenkrantz <[email protected]> Date: Fri Aug 25 14:47:05 2017 -0400 Revert "force recalc on bryce scroller when doing recalc on gadget site" This reverts commit 87515abd2a0919ade6e1600b633cfa703ac11336. this breaks scaling since the min size must be reset in order to trigger a resize --- src/bin/e_bryce.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c index 9e7032564..503529b12 100644 --- a/src/bin/e_bryce.c +++ b/src/bin/e_bryce.c @@ -219,8 +219,8 @@ _bryce_autosize(Bryce *b) e_efx_resize(b->bryce, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_POINT(x, y), w, lround(b->size * e_scale), 0.1, NULL, NULL); else if (b->orient == E_GADGET_SITE_ORIENT_VERTICAL) e_efx_resize(b->bryce, E_EFX_EFFECT_SPEED_LINEAR, E_EFX_POINT(x, y), lround(b->size * e_scale), h, 0.1, NULL, NULL); - elm_layout_sizing_eval(b->scroller); evas_object_smart_need_recalculate_set(b->site, 1); + evas_object_size_hint_min_set(b->site, -1, -1); if (b->size_changed) elm_object_content_set(b->scroller, b->site); b->size_changed = 0; @@ -257,8 +257,8 @@ _bryce_autosize(Bryce *b) evas_object_resize(b->bryce, lround(b->size * e_scale), h * lround(b->size * e_scale) / w); evas_object_resize(b->site, lround(b->size * e_scale), h * lround(b->size * e_scale) / w); } - elm_layout_sizing_eval(b->scroller); evas_object_smart_need_recalculate_set(b->site, 1); + evas_object_size_hint_min_set(b->site, -1, -1); evas_object_smart_calculate(b->site); elm_object_content_set(b->scroller, b->site); } @@ -509,8 +509,8 @@ _bryce_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event if (((b->orient == E_GADGET_SITE_ORIENT_VERTICAL) && (w != b->last_w)) || ((b->orient == E_GADGET_SITE_ORIENT_HORIZONTAL) && (h != b->last_h))) { - elm_layout_sizing_eval(b->scroller); evas_object_smart_need_recalculate_set(b->site, 1); + evas_object_size_hint_min_set(b->site, -1, -1); } b->last_w = w, b->last_h = h; --
