discomfitor pushed a commit to branch efl-1.20.

http://git.enlightenment.org/core/efl.git/commit/?id=5ceda8002dd07e37211ea9a400025e28d1168a6f

commit 5ceda8002dd07e37211ea9a400025e28d1168a6f
Author: Mike Blumenkrantz <[email protected]>
Date:   Fri Aug 11 18:43:15 2017 -0400

    elm_widget: do not reparent subobjs to top widget for non-elm objects
    
    this breaks handling of non-elm objects and makes it impossible to safely 
manage
    object lifetimes
    
    ref D3957
    ref 62cf70034de38b17f2025e08f81b5758b3d6d6e3
    
    @fix
---
 src/lib/elementary/elm_widget.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index bcfb5aed52..88832e8905 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -851,7 +851,8 @@ static inline Eina_Bool
 _elm_widget_sub_object_redirect_to_top(Evas_Object *obj, Evas_Object *sobj)
 {
    Eina_Bool ret = elm_widget_sub_object_del(obj, sobj);
-   if (ret)
+   if (!ret) return ret;
+   if (elm_widget_is(sobj))
      ret = elm_widget_sub_object_add(elm_widget_top_get(obj), sobj);
 
    return ret;

-- 


Reply via email to