[EGIT] [core/elementary] master 01/02: panel: Delay elm_layout_theme_set until memebers are initialized in _smart_add

[Ryuan Choi]

ryuan pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=ec698973246a9d6f9428ff0988fdff88627192c5

commit ec698973246a9d6f9428ff0988fdff88627192c5
Author: Ryuan Choi <ryuan.c...@gmail.com>
Date:   Thu Jan 16 04:02:11 2014 +0900

    panel: Delay elm_layout_theme_set until memebers are initialized in 
_smart_add
    
    elm_layout_theme_set can call some methods like _elm_panel_smart_theme and 
there are some warnings
    when these methods manipulate some member variabls which are not 
initialized yet.
    It's because elm_layout_theme_set is called too early in _smart_add.
    
    Spotted while digging warnings after rELM4c3e23de9e46
---
 src/lib/elm_panel.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 82b2cac..e856a94 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -359,16 +359,11 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list 
EINA_UNUSED)
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
-   /* just to bootstrap and have theme hook to work */
-   if (!elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)))
-     CRI("Failed to set layout!");
-
    eo_do(obj, elm_wdg_theme(NULL));
 
    priv->bx = evas_object_box_add(evas_object_evas_get(obj));
    evas_object_size_hint_align_set(priv->bx, 0.5, 0.5);
    evas_object_box_layout_set(priv->bx, _box_layout_cb, priv, NULL);
-   elm_layout_content_set(obj, "elm.swallow.content", priv->bx);
    evas_object_show(priv->bx);
 
    elm_layout_signal_callback_add
@@ -379,16 +374,25 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list 
EINA_UNUSED)
    priv->event = evas_object_rectangle_add(evas_object_evas_get(obj));
    evas_object_color_set(priv->event, 0, 0, 0, 0);
    evas_object_pass_events_set(priv->event, EINA_TRUE);
-   if (edje_object_part_exists
-       (wd->resize_obj, "elm.swallow.event"))
+   elm_widget_sub_object_add(obj, priv->event);
+
+   /* just to bootstrap and have theme hook to work */
+   if (!elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)))
+     CRI("Failed to set layout!");
+   else
      {
-        Evas_Coord minw = 0, minh = 0;
+        elm_layout_content_set(obj, "elm.swallow.content", priv->bx);
 
-        elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-        evas_object_size_hint_min_set(priv->event, minw, minh);
-        elm_layout_content_set(obj, "elm.swallow.event", priv->event);
+        if (edje_object_part_exists
+            (wd->resize_obj, "elm.swallow.event"))
+          {
+             Evas_Coord minw = 0, minh = 0;
+
+             elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+             evas_object_size_hint_min_set(priv->event, minw, minh);
+             elm_layout_content_set(obj, "elm.swallow.event", priv->event);
+          }
      }
-   elm_widget_sub_object_add(obj, priv->event);
 
    elm_layout_sizing_eval(obj);
 }

--