elementary/widgets - set parents before widget constructs their body.

This avoids unnecessary setups again when obj <-> sub has connected.
This commit is contained in:
ChunEon Park 2013-08-27 00:29:45 +09:00
parent 58265635c6
commit fe0f0a445e
26 changed files with 50 additions and 52 deletions

View File

@ -1129,6 +1129,8 @@ _elm_ctxpopup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
if (!elm_layout_theme_set
(obj, "ctxpopup", "base", elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");
@ -1229,8 +1231,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -829,6 +829,7 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
priv->expand = !!_elm_config->fileselector_expand_enable;
@ -976,8 +977,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -173,6 +173,8 @@ _elm_fileselector_button_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE);
if (getenv("HOME")) priv->fsd.path = eina_stringshare_add(getenv("HOME"));
else priv->fsd.path = eina_stringshare_add("/");
@ -234,8 +236,6 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -356,6 +356,8 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
if (!elm_layout_theme_set
(obj, "fileselector_entry", "base", elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");
@ -430,8 +432,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -225,10 +225,13 @@ _elm_hoversel_smart_add(Eo *obj, void *_pd __UNUSED__,
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
evas_object_smart_callback_add(obj, "clicked", _on_clicked, obj);
//What are you doing here?
eo_do(obj, elm_wdg_theme(NULL));
}
@ -297,8 +300,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -1453,6 +1453,8 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
if (!elm_layout_theme_set
(obj, "multibuttonentry", "base", elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");
@ -1610,8 +1612,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI Evas_Object *

View File

@ -632,6 +632,8 @@ _elm_player_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
char buf[256];
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
Elm_Player_Smart_Data *priv = _pd;
if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
@ -724,8 +726,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
#else
eo_error_set(obj);
#endif

View File

@ -38,6 +38,7 @@ _elm_access_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
elm_widget_can_focus_set(obj, _elm_config->access_mode);
}
@ -1156,8 +1157,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, eo_constructor());
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI Evas_Object *

View File

@ -396,6 +396,8 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
priv->enabled_position = ELM_ACTIONSLIDER_ALL;
priv->drag_button_base =
@ -444,8 +446,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -408,6 +408,8 @@ _elm_box_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
evas_object_smart_callback_add(wd->resize_obj, SIG_CHILD_ADDED,
_child_added_cb_proxy, obj);
evas_object_smart_callback_add(wd->resize_obj, SIG_CHILD_REMOVED,
@ -462,7 +464,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -203,6 +203,8 @@ _elm_bubble_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
priv->pos = ELM_BUBBLE_POS_TOP_LEFT; //default
elm_widget_can_focus_set(obj, EINA_FALSE);
@ -255,8 +257,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -950,6 +950,8 @@ _elm_calendar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
priv->first_interval = 0.85;
priv->year_min = 2;
priv->year_max = -1;
@ -1185,8 +1187,6 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -293,6 +293,8 @@ _elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
edje_object_signal_callback_add
(wd->resize_obj, "elm,action,check,on", "",
_on_check_on, obj);
@ -349,8 +351,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -668,6 +668,8 @@ _elm_clock_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
priv->cur.ampm = -1;
priv->cur.seconds = EINA_TRUE;
priv->cur.am_pm = EINA_TRUE;
@ -823,8 +825,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
static void

View File

@ -1495,6 +1495,8 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
if (!elm_layout_theme_set
(obj, "colorselector", "palette", elm_object_style_get(obj)))
CRITICAL("Failed to set layout!");
@ -1870,8 +1872,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -900,6 +900,7 @@ _elm_conformant_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNU
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
if (!elm_layout_theme_set
@ -984,9 +985,6 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
Elm_Conformant_Smart_Data *sd = _pd;
top = elm_widget_top_get(obj);

View File

@ -799,6 +799,8 @@ _elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
if (!elm_layout_theme_set(obj, "datetime", "base",
elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");
@ -887,8 +889,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI const char *

View File

@ -432,6 +432,8 @@ _elm_dayselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
if (!elm_layout_theme_set(obj, "dayselector", "base", "dayselector"))
CRITICAL("Failed to set layout!");
@ -480,8 +482,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -1271,6 +1271,8 @@ _elm_diskselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
Evas *evas;
Evas_Object *blank, *edje;
elm_widget_sub_object_add(eo_parent_get(obj), obj);
evas = evas_object_evas_get(obj);
evas_event_freeze(evas);
@ -1485,8 +1487,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI Eina_Bool

View File

@ -2959,6 +2959,8 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
priv->entry_edje = wd->resize_obj;
priv->cnp_mode = ELM_CNP_MODE_MARKUP;
@ -3272,8 +3274,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -1810,6 +1810,8 @@ _elm_flip_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_static_clip_set(priv->clip, EINA_TRUE);
evas_object_move(priv->clip, -49999, -49999);
@ -1877,8 +1879,6 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI Eina_Bool

View File

@ -559,6 +559,8 @@ _elm_flipselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
if (!elm_layout_theme_set
(obj, "flipselector", "base", elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");
@ -614,8 +616,6 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -175,6 +175,8 @@ _elm_frame_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
edje_object_signal_callback_add
(wd->resize_obj, "elm,anim,done", "elm",
_on_recalc_done, obj);
@ -220,8 +222,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -2396,6 +2396,8 @@ _elm_gengrid_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), 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);
@ -2546,8 +2548,6 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI void

View File

@ -4826,6 +4826,8 @@ _elm_genlist_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), 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);
@ -5015,8 +5017,6 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
static void

View File

@ -3738,6 +3738,8 @@ _elm_gesture_layer_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_add(eo_parent_get(obj), obj);
Elm_Gesture_Layer_Smart_Data *priv = _pd;
priv->line_min_length =
@ -3830,8 +3832,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, eo_constructor());
eo_do(obj, evas_obj_type_set(MY_CLASS_NAME));
elm_widget_sub_object_add(eo_parent_get(obj), obj);
}
EAPI Eina_Bool