From ca072667db506e506a799b902cfc80b1d0027935 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Wed, 2 May 2012 16:58:31 +0000 Subject: [PATCH] [Elm] Helper on resize_object_add() SVN revision: 70635 --- legacy/elementary/src/lib/elm_layout.c | 7 ++++--- legacy/elementary/src/lib/elm_widget.c | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c index 53288a7848..c2708f575e 100644 --- a/legacy/elementary/src/lib/elm_layout.c +++ b/legacy/elementary/src/lib/elm_layout.c @@ -1149,13 +1149,14 @@ _elm_layout_smart_add(Evas_Object *obj) { EVAS_SMART_DATA_ALLOC(obj, Elm_Layout_Smart_Data); + /* has to be there *before* parent's smart_add() */ + ELM_WIDGET_DATA(priv)->resize_obj = + edje_object_add(evas_object_evas_get(obj)); + ELM_WIDGET_CLASS(_elm_layout_parent_sc)->base.add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); - priv->base.resize_obj = edje_object_add(evas_object_evas_get(obj)); - elm_widget_resize_object_set(obj, priv->base.resize_obj); - edje_object_signal_callback_add (ELM_WIDGET_DATA(priv)->resize_obj, "size,eval", "elm", _on_size_evaluate_signal, obj); diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index 4fcfc532d3..611c405391 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -4089,6 +4089,15 @@ _smart_add(Evas_Object *obj) * settings */ elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_mirrored_set(obj, elm_config_mirrored_get()); + + /* just a helper for inheriting classes */ + if (priv->resize_obj) + { + Evas_Object *r_obj = priv->resize_obj; + priv->resize_obj = NULL; + + elm_widget_resize_object_set(obj, r_obj); + } } static Evas_Object *