discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f691a8fa183cd7351495f59d88701b7967a87f38
commit f691a8fa183cd7351495f59d88701b7967a87f38 Author: Mike Blumenkrantz <[email protected]> Date: Tue Jan 20 19:20:04 2015 -0500 fix elm box parenting --- src/bin/e_gadcon.c | 2 +- src/bin/e_ilist.c | 2 +- src/bin/e_menu.c | 4 ++-- src/bin/e_widget_list.c | 2 +- src/bin/e_widget_toolbar.c | 2 +- src/modules/everything/evry_view_help.c | 2 +- src/modules/everything/evry_view_tabs.c | 2 +- src/modules/fileman/e_fwin_nav.c | 2 +- src/modules/fileman_opinfo/e_mod_main.c | 2 +- src/modules/ibar/e_mod_main.c | 4 ++-- src/modules/ibox/e_mod_main.c | 2 +- src/modules/tasks/e_mod_main.c | 2 +- src/modules/winlist/e_winlist.c | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index db5ef4b..732ec3f 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -1067,7 +1067,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id __UNUSED__, c if (gcc->o_frame) { edje_object_size_min_calc(gcc->o_frame, &(gcc->pad.w), &(gcc->pad.h)); - gcc->o_box = elm_box_add(gcc->gadcon->o_container); + gcc->o_box = elm_box_add(e_win_evas_object_win_get(gcc->gadcon->o_container)); evas_object_event_callback_add(gcc->o_box, EVAS_CALLBACK_DEL, _e_gadcon_client_box_del, gcc); evas_object_event_callback_add(gcc->o_box, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _e_gadcon_client_box_hints_changed, gcc); switch (gcc->gadcon->orient) diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c index 898d435..c3d3c66 100644 --- a/src/bin/e_ilist.c +++ b/src/bin/e_ilist.c @@ -776,7 +776,7 @@ _e_smart_add(Evas_Object *obj) sd->typebuf.size = 0; sd->typebuf.timer = NULL; - sd->o_box = elm_box_add(obj); + sd->o_box = elm_box_add(e_win_evas_win_get(e)); elm_box_align_set(sd->o_box, 0.0, 0.0); elm_box_homogeneous_set(sd->o_box, 0); evas_object_smart_member_add(sd->o_box, obj); diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index e543690..846b951 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1392,7 +1392,7 @@ no_submenu_item: } evas_object_show(o); - o = elm_box_add(o); + o = elm_box_add(e_comp->elm); evas_object_name_set(o, "mi->container_object"); elm_box_homogeneous_set(o, 0); mi->container_object = o; @@ -1644,7 +1644,7 @@ _e_menu_realize(E_Menu *m) evas_object_move(m->comp_object, m->cur.x, m->cur.y); evas_object_resize(m->comp_object, m->cur.w, m->cur.h); - o = elm_box_add(m->comp_object); + o = elm_box_add(e_comp->elm); evas_object_name_set(o, "menu->container_object"); m->container_object = o; evas_object_intercept_move_callback_add(o, _e_menu_cb_intercept_container_move, m); diff --git a/src/bin/e_widget_list.c b/src/bin/e_widget_list.c index 581c684..e154601 100644 --- a/src/bin/e_widget_list.c +++ b/src/bin/e_widget_list.c @@ -31,7 +31,7 @@ e_widget_list_add(Evas *evas, int homogenous, int horiz) wd = calloc(1, sizeof(E_Widget_Data)); e_widget_data_set(obj, wd); - o = elm_box_add(obj); + o = elm_box_add(e_win_evas_win_get(evas)); wd->o_box = o; elm_box_horizontal_set(o, horiz); elm_box_homogeneous_set(o, homogenous); diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c index dfe70c5..a126744 100644 --- a/src/bin/e_widget_toolbar.c +++ b/src/bin/e_widget_toolbar.c @@ -55,7 +55,7 @@ e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h) o = e_scrollframe_add(evas); wd->o_base = o; - o = elm_box_add(o); + o = elm_box_add(e_win_evas_win_get(evas)); wd->o_box = o; o = wd->o_base; e_scrollframe_custom_theme_set(o, "base/theme/widgets", "e/widgets/toolbar"); diff --git a/src/modules/everything/evry_view_help.c b/src/modules/everything/evry_view_help.c index 7150a12..eb98915 100644 --- a/src/modules/everything/evry_view_help.c +++ b/src/modules/everything/evry_view_help.c @@ -86,7 +86,7 @@ _view_create(Evry_View *v, const Evry_State *s __UNUSED__, Evas_Object *swallow) if (v->active) return v; - o = elm_box_add(swallow); + o = elm_box_add(e_win_evas_object_win_get(swallow)); elm_box_horizontal_set(o, 0); elm_box_align_set(o, 0.5, 1.0); v->o_list = o; diff --git a/src/modules/everything/evry_view_tabs.c b/src/modules/everything/evry_view_tabs.c index 31de153..f149e40 100644 --- a/src/modules/everything/evry_view_tabs.c +++ b/src/modules/everything/evry_view_tabs.c @@ -365,7 +365,7 @@ evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas_Object *parent) v->state = s; v->evas = evas_object_evas_get(parent); - o = elm_box_add(parent); + o = elm_box_add(e_win_evas_object_win_get(parent)); elm_box_horizontal_set(o, 1); elm_box_homogeneous_set(o, 1); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c index 689210b..6c92e6d 100644 --- a/src/modules/fileman/e_fwin_nav.c +++ b/src/modules/fileman/e_fwin_nav.c @@ -335,7 +335,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) e_scrollframe_thumbscroll_force(inst->o_scroll, 1); evas_object_show(inst->o_scroll); - inst->o_box = elm_box_add(gc->o_container); + inst->o_box = elm_box_add(e_win_evas_object_win_get(gc->o_container)); evas_object_repeat_events_set(inst->o_box, EINA_TRUE); elm_box_horizontal_set(inst->o_box, 1); elm_box_homogeneous_set(inst->o_box, 0); diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c index a4de2e2..fbebb22 100644 --- a/src/modules/fileman_opinfo/e_mod_main.c +++ b/src/modules/fileman_opinfo/e_mod_main.c @@ -367,7 +367,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) } // main object - inst->o_box = elm_box_add(gc->o_container); + inst->o_box = elm_box_add(e_win_evas_object_win_get(gc->o_container)); elm_box_homogeneous_set(inst->o_box, 0); elm_box_horizontal_set(inst->o_box, 0); elm_box_align_set(inst->o_box, 0, 0); diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 8a8a7c8..1bc249c 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -402,10 +402,10 @@ _ibar_new(Evas_Object *parent, Instance *inst) inst->ibar = b; b->inst = inst; b->icon_hash = eina_hash_string_superfast_new(NULL); - b->o_outerbox = elm_box_add(parent); + b->o_outerbox = elm_box_add(e_win_evas_object_win_get(parent)); elm_box_horizontal_set(b->o_outerbox, 1); elm_box_align_set(b->o_outerbox, 0.5, 0.5); - b->o_box = elm_box_add(parent); + b->o_box = elm_box_add(e_win_evas_object_win_get(parent)); E_EXPAND(b->o_box); E_FILL(b->o_box); elm_box_homogeneous_set(b->o_box, 1); diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index bdd3c2e..dafd27a 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -319,7 +319,7 @@ _ibox_new(Evas_Object *parent, E_Zone *zone) IBox *b; b = E_NEW(IBox, 1); - b->o_box = elm_box_add(parent); + b->o_box = elm_box_add(e_win_evas_object_win_get(parent)); elm_box_homogeneous_set(b->o_box, 1); elm_box_horizontal_set(b->o_box, 1); elm_box_align_set(b->o_box, 0.5, 0.5); diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c index d09fd23..2da59f4 100644 --- a/src/modules/tasks/e_mod_main.c +++ b/src/modules/tasks/e_mod_main.c @@ -363,7 +363,7 @@ _tasks_new(Evas_Object *parent, E_Zone *zone, const char *id) tasks = E_NEW(Tasks, 1); tasks->config = _tasks_config_item_get(id); - tasks->o_items = elm_box_add(parent); + tasks->o_items = elm_box_add(e_win_evas_object_win_get(parent)); tasks->horizontal = 1; EINA_LIST_FOREACH(zone->comp->clients, l, ec) { diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c index ec11dae..8b455dd 100644 --- a/src/modules/winlist/e_winlist.c +++ b/src/modules/winlist/e_winlist.c @@ -155,7 +155,7 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter) e_theme_edje_object_set(o, "base/theme/winlist", "e/widgets/winlist/main"); - o = elm_box_add(o); + o = elm_box_add(e_comp->elm); _list_object = o; elm_box_homogeneous_set(o, 1); e_comp_object_util_del_list_append(_winlist, o); --
