discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=706784d7c8de6645b32915d0e4c2a2cc097ec183

commit 706784d7c8de6645b32915d0e4c2a2cc097ec183
Author: Alastair Poole <[email protected]>
Date:   Tue Aug 14 15:48:27 2018 -0400

    elm_panel: return instead of EINA_SAFETY_ON_FALSE_RETURN
    
    Summary:
    As with other checks in ELM return if object is not yet
    finalized. This stops lots of console noise.
    
    @fix T7265
    
    Test Plan:
    elementary_test: use panel test from console and view the noise
    from EINA. Apply then do the same.
    
    Reviewers: #committers, zmike
    
    Reviewed By: #committers, zmike
    
    Subscribers: cedric, #reviewers, zmike
    
    Tags: #efl
    
    Maniphest Tasks: T7265
    
    Differential Revision: https://phab.enlightenment.org/D6826
---
 src/lib/elementary/elm_panel.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 39ea9853dc..478d82c60d 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -60,7 +60,6 @@ _elm_panel_elm_layout_sizing_eval(Eo *obj, Elm_Panel_Data *sd)
 {
    Evas_Coord mw = 0, mh = 0;
 
-   EINA_SAFETY_ON_FALSE_RETURN(efl_finalized_get(obj));
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
    if (sd->delete_me) return;
@@ -261,7 +260,8 @@ _elm_panel_efl_ui_widget_theme_apply(Eo *obj, 
Elm_Panel_Data *sd)
           efl_content_set(efl_part(efl_super(obj, MY_CLASS), 
"elm.swallow.event"), sd->event);
      }
 
-   elm_layout_sizing_eval(obj);
+   if (efl_finalized_get(obj))
+     elm_layout_sizing_eval(obj);
 
    return int_ret;
 }
@@ -765,7 +765,8 @@ _elm_panel_content_set(Eo *obj, Elm_Panel_Data *sd, const 
char *part, Evas_Objec
           elm_widget_sub_object_add(obj, sd->content);
      }
 
-   elm_layout_sizing_eval(obj);
+   if (efl_finalized_get(obj))
+     elm_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -867,8 +868,6 @@ _elm_panel_efl_canvas_group_group_add(Eo *obj, 
Elm_Panel_Data *priv)
              efl_content_set(efl_part(efl_super(obj, MY_CLASS), 
"elm.swallow.event"), priv->event);
           }
      }
-
-   elm_layout_sizing_eval(obj);
 }
 
 EOLIAN static void
@@ -928,8 +927,8 @@ _scrollable_layout_resize(Eo *obj, Elm_Panel_Data *sd, 
Evas_Coord w, Evas_Coord
          evas_object_size_hint_min_set(sd->scr_event, w, h);
          break;
      }
-
-   elm_layout_sizing_eval(obj);
+   if (efl_finalized_get(obj))
+     elm_layout_sizing_eval(obj);
 }
 
 EOLIAN static void
@@ -1034,7 +1033,8 @@ _elm_panel_orient_set(Eo *obj, Elm_Panel_Data *sd, 
Elm_Panel_Orient orient)
    else
      _orient_set_do(obj);
 
-   elm_layout_sizing_eval(obj);
+   if (efl_finalized_get(obj))
+     elm_layout_sizing_eval(obj);
 }
 
 EOLIAN static Elm_Panel_Orient

-- 


Reply via email to