elm_object: revert deferred sizing_eval to keep backward compatibility

If legacy widget that override `efl_canvas_group_calculate` call
`elm_layout_sizing_eval`, the overridden function
`_xxx_efl_canvas_group_group_calculate` is called.

This reverts commit 29270c6861f999fae438b650e009dd9c706b4015.
This reverts commit 29270c6861f999fae438b650e009dd9c706b4015.

@tizen_fix

Change-Id: Ib3efae3ad057ac166309414aff8dc3ba44247b49

diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 2cd86ef..be8c5fc 100644 (file)
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -158,10 +158,7 @@ _on_sub_object_size_hint_change(void *data,
 {
    if (!efl_alive_get(data)) return;
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
-   //TIZEN_ONLY(20190919): efl_ui_layout: restore sizing_eval logic to keep backward compatibility
-   //efl_canvas_group_change(data);
-   elm_layout_sizing_eval(data);
-   //
+   efl_canvas_group_change(data);
 }
 
 static void
@@ -2038,9 +2035,6 @@ EOLIAN static void
 _elm_layout_sizing_eval(Eo *obj, Elm_Layout_Data *ld)
 {
    _elm_layout_efl_canvas_group_change(obj, ld);
-   // TIZEN_ONLY(20190911): restore sizing_eval logic to keep backward compatibility
-   efl_canvas_group_calculate(obj);
-   //
 }
 
 EAPI void

diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 47f0839..a0e74ea 100644 (file)
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -1015,7 +1015,8 @@ void efl_ui_slider_move_knob(Evas_Object *obj, double button_x, double button_y)
 # define EFL_UI_LAYOUT_TEXT_ALIASES_OPS(_pfx) _EFL_UI_LAYOUT_ALIASES_OPS(_pfx, text)
 
 # define EFL_CANVAS_GROUP_CALC_OPS(_pfx) \
-   EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _##_pfx##_efl_canvas_group_group_calculate)
+   EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _##_pfx##_efl_canvas_group_group_calculate), \
+   EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _##_pfx##_efl_canvas_group_group_calculate)
 
 # define ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(_pfx, _typ) \
 EOLIAN static Eina_Bool \