[elm] No init code out of smart_add() -- scroller.

SVN revision: 73995

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index a5e7877..dd9153d 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -598,13 +598,67 @@ _elm_scroller_smart_content_unset(Evas_Object *obj,
 }
 
 static void
+_elm_scroller_content_min_limit_cb(Evas_Object *obj,
+                                   Eina_Bool w,
+                                   Eina_Bool h)
+{
+   ELM_SCROLLER_DATA_GET(obj, sd);
+
+   sd->min_w = !!w;
+   sd->min_h = !!h;
+
+   elm_layout_sizing_eval(obj);
+}
+
+static void
 _elm_scroller_smart_add(Evas_Object *obj)
 {
+   Evas_Coord minw, minh;
+
    EVAS_SMART_DATA_ALLOC(obj, Elm_Scroller_Smart_Data);
 
    ELM_WIDGET_CLASS(_elm_scroller_parent_sc)->base.add(obj);
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
+
+   elm_layout_theme_set(obj, "scroller", "base", elm_widget_style_get(obj));
+
+   priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
+   evas_object_smart_member_add(priv->hit_rect, obj);
+   elm_widget_sub_object_add(obj, priv->hit_rect);
+
+   evas_object_color_set(priv->hit_rect, 0, 0, 0, 0);
+   evas_object_show(priv->hit_rect);
+   evas_object_repeat_events_set(priv->hit_rect, EINA_TRUE);
+
+   /* FIXME: rework it */
+   elm_widget_focus_region_hook_set(obj, _focus_region_hook);
+
+   priv->s_iface = evas_object_smart_interface_get
+       (obj, ELM_SCROLLABLE_IFACE_NAME);
+
+   priv->s_iface->objects_set
+     (obj, ELM_WIDGET_DATA(priv)->resize_obj, priv->hit_rect);
+
+   evas_object_event_callback_add
+     (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb, obj);
+
+   edje_object_size_min_calc(ELM_WIDGET_DATA(priv)->resize_obj, &minw, &minh);
+   evas_object_size_hint_min_set(obj, minw, minh);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize_cb, obj);
+
+   priv->s_iface->edge_left_cb_set(obj, _edge_left_cb);
+   priv->s_iface->edge_right_cb_set(obj, _edge_right_cb);
+   priv->s_iface->edge_top_cb_set(obj, _edge_top_cb);
+   priv->s_iface->edge_bottom_cb_set(obj, _edge_bottom_cb);
+   priv->s_iface->scroll_cb_set(obj, _scroll_cb);
+   priv->s_iface->animate_start_cb_set(obj, _scroll_anim_start_cb);
+   priv->s_iface->animate_stop_cb_set(obj, _scroll_anim_stop_cb);
+   priv->s_iface->drag_start_cb_set(obj, _scroll_drag_start_cb);
+   priv->s_iface->drag_stop_cb_set(obj, _scroll_drag_stop_cb);
+
+   priv->s_iface->content_min_limit_cb_set
+     (obj, _elm_scroller_content_min_limit_cb);
 }
 
 static void
@@ -663,25 +717,11 @@ _elm_scroller_smart_set_user(Elm_Layout_Smart_Class *sc)
    ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_scroller_smart_sizing_eval;
 }
 
-static void
-_elm_scroller_content_min_limit_cb(Evas_Object *obj,
-                                   Eina_Bool w,
-                                   Eina_Bool h)
-{
-   ELM_SCROLLER_DATA_GET(obj, sd);
-
-   sd->min_w = !!w;
-   sd->min_h = !!h;
-
-   elm_layout_sizing_eval(obj);
-}
-
 EAPI Evas_Object *
 elm_scroller_add(Evas_Object *parent)
 {
    Evas *e;
    Evas_Object *obj;
-   Evas_Coord minw, minh;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
 
@@ -693,50 +733,6 @@ elm_scroller_add(Evas_Object *parent)
    if (!elm_widget_sub_object_add(parent, obj))
      ERR("could not add %p as sub object of %p", obj, parent);
 
-   ELM_SCROLLER_DATA_GET(obj, sd);
-
-   elm_layout_theme_set(obj, "scroller", "base", elm_widget_style_get(obj));
-
-   sd->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
-   evas_object_smart_member_add(sd->hit_rect, obj);
-   elm_widget_sub_object_add(obj, sd->hit_rect);
-
-   /* common scroller hit rectangle setup -- it has to take place
-    * AFTER smart_member_add() */
-   evas_object_color_set(sd->hit_rect, 0, 0, 0, 0);
-   evas_object_show(sd->hit_rect);
-   evas_object_repeat_events_set(sd->hit_rect, EINA_TRUE);
-
-   /* FIXME: rework it */
-   elm_widget_focus_region_hook_set(obj, _focus_region_hook);
-
-   /* interface's add() routive issued AFTER the object's smart_add() */
-   sd->s_iface = evas_object_smart_interface_get
-       (obj, ELM_SCROLLABLE_IFACE_NAME);
-
-   sd->s_iface->objects_set
-     (obj, ELM_WIDGET_DATA(sd)->resize_obj, sd->hit_rect);
-
-   evas_object_event_callback_add
-     (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb, obj);
-
-   edje_object_size_min_calc(ELM_WIDGET_DATA(sd)->resize_obj, &minw, &minh);
-   evas_object_size_hint_min_set(obj, minw, minh);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize_cb, obj);
-
-   sd->s_iface->edge_left_cb_set(obj, _edge_left_cb);
-   sd->s_iface->edge_right_cb_set(obj, _edge_right_cb);
-   sd->s_iface->edge_top_cb_set(obj, _edge_top_cb);
-   sd->s_iface->edge_bottom_cb_set(obj, _edge_bottom_cb);
-   sd->s_iface->scroll_cb_set(obj, _scroll_cb);
-   sd->s_iface->animate_start_cb_set(obj, _scroll_anim_start_cb);
-   sd->s_iface->animate_stop_cb_set(obj, _scroll_anim_stop_cb);
-   sd->s_iface->drag_start_cb_set(obj, _scroll_drag_start_cb);
-   sd->s_iface->drag_stop_cb_set(obj, _scroll_drag_stop_cb);
-
-   sd->s_iface->content_min_limit_cb_set
-     (obj, _elm_scroller_content_min_limit_cb);
-
    return obj;
 }