cedric pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=cbff61a002b6197d64cb4cd47f0801fdc359844a
commit cbff61a002b6197d64cb4cd47f0801fdc359844a Author: Cedric BAIL <c.b...@partner.samsung.com> Date: Sat Jun 7 18:29:17 2014 +0200 edje: remove use of deprecated functions. --- src/bin/e_bg.c | 8 ++++---- src/bin/e_ilist.c | 12 ++++++------ src/bin/e_menu.c | 8 ++++---- src/bin/e_module.c | 2 +- src/bin/e_shelf.c | 4 ++-- src/bin/e_widget_check.c | 2 +- src/bin/e_widget_frametable.c | 6 +++--- src/bin/e_widget_label.c | 2 +- src/bin/e_widget_toolbar.c | 2 +- src/modules/conf/e_conf.c | 4 ++-- src/modules/conf_intl/e_int_config_imc_import.c | 4 ++-- src/modules/conf_theme/e_int_config_theme.c | 4 ++-- src/modules/conf_theme/e_int_config_theme_import.c | 4 ++-- src/modules/conf_wallpaper2/e_int_config_wallpaper.c | 4 ++-- src/modules/fileman/e_fwin.c | 12 ++++++------ src/modules/illume-indicator/e_mod_ind_win.c | 6 +++--- src/modules/shot/e_mod_main.c | 6 +++--- src/modules/syscon/e_syscon.c | 6 +++--- src/modules/winlist/e_winlist.c | 4 ++-- 19 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c index e0ccf4a..3a47f4c 100644 --- a/src/bin/e_bg.c +++ b/src/bin/e_bg.c @@ -283,12 +283,12 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) if (transition != E_BG_TRANSITION_NONE) { - edje_extern_object_max_size_set(zone->prev_bg_object, 65536, 65536); - edje_extern_object_min_size_set(zone->prev_bg_object, 0, 0); + evas_object_size_hint_max_set(zone->prev_bg_object, 65536, 65536); + evas_object_size_hint_min_set(zone->prev_bg_object, 0, 0); edje_object_part_swallow(zone->transition_object, "e.swallow.bg.old", zone->prev_bg_object); - edje_extern_object_max_size_set(zone->bg_object, 65536, 65536); - edje_extern_object_min_size_set(zone->bg_object, 0, 0); + evas_object_size_hint_max_set(zone->bg_object, 65536, 65536); + evas_object_size_hint_min_set(zone->bg_object, 0, 0); edje_object_part_swallow(zone->transition_object, "e.swallow.bg.new", zone->bg_object); edje_object_signal_emit(zone->transition_object, "e,action,start", "e"); diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c index 0241f50..3a4862f 100644 --- a/src/bin/e_ilist.c +++ b/src/bin/e_ilist.c @@ -541,7 +541,7 @@ e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon) si->o_icon = icon; if (si->o_icon) { - edje_extern_object_min_size_set(si->o_icon, sd->iw, sd->ih); + evas_object_size_hint_min_set(si->o_icon, sd->iw, sd->ih); edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon); evas_object_show(si->o_icon); } @@ -575,7 +575,7 @@ e_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end) si->o_end = end; if (si->o_end) { - edje_extern_object_min_size_set(si->o_end, sd->iw, sd->ih); + evas_object_size_hint_min_set(si->o_end, sd->iw, sd->ih); edje_object_part_swallow(si->o_base, "e.swallow.end", si->o_end); evas_object_show(si->o_end); } @@ -622,7 +622,7 @@ e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) if (!si) continue; if (!si->o_icon) continue; - edje_extern_object_min_size_set(si->o_icon, w, h); + evas_object_size_hint_min_set(si->o_icon, w, h); edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon); if (si->o_end) @@ -635,7 +635,7 @@ e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) ew = w; eh = h; } - edje_extern_object_min_size_set(si->o_end, ew, eh); + evas_object_size_hint_min_set(si->o_end, ew, eh); } edje_object_size_min_calc(si->o_base, &mw, &mh); @@ -1361,7 +1361,7 @@ _e_ilist_item_new(E_Smart_Data *sd, Evas_Object *icon, Evas_Object *end, const c si->o_icon = icon; if (si->o_icon) { - edje_extern_object_min_size_set(si->o_icon, sd->iw, sd->ih); + evas_object_size_hint_min_set(si->o_icon, sd->iw, sd->ih); edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon); evas_object_show(si->o_icon); } @@ -1376,7 +1376,7 @@ _e_ilist_item_new(E_Smart_Data *sd, Evas_Object *icon, Evas_Object *end, const c ew = sd->iw; eh = sd->ih; } - edje_extern_object_min_size_set(si->o_end, ew, eh); + evas_object_size_hint_min_set(si->o_end, ew, eh); edje_object_part_swallow(si->o_base, "e.swallow.end", si->o_end); evas_object_show(si->o_end); } diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index acae3a3..3b32dde 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1570,7 +1570,7 @@ no_submenu_item: if (mi->icon_bg_object) { - edje_extern_object_min_size_set(mi->icon_object, 0, 0); + evas_object_size_hint_min_set(mi->icon_object, 0, 0); edje_object_part_swallow(mi->icon_bg_object, "e.swallow.content", mi->icon_object); @@ -1968,7 +1968,7 @@ _e_menu_items_layout_update(E_Menu *m) 0, 0, /* min */ 0, 0 /* max */ ); - edje_extern_object_min_size_set(mi->container_object, + evas_object_size_hint_min_set(mi->container_object, min_w, min_h); edje_object_part_swallow(mi->bg_object, "e.swallow.content", mi->container_object); @@ -1984,8 +1984,8 @@ _e_menu_items_layout_update(E_Menu *m) e_box_thaw(mi->container_object); } e_box_size_min_get(m->container_object, &bw, &bh); - edje_extern_object_min_size_set(m->container_object, bw, bh); - edje_extern_object_max_size_set(m->container_object, bw, bh); + evas_object_size_hint_min_set(m->container_object, bw, bh); + evas_object_size_hint_max_set(m->container_object, bw, bh); edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object); edje_object_size_min_calc(m->bg_object, &mw, &mh); e_box_thaw(m->container_object); diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 186c97a..a9b5057 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -418,7 +418,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body) } else dia->icon_object = e_util_icon_add(icon, e_win_evas_get(dia->win)); - edje_extern_object_min_size_set(dia->icon_object, 64, 64); + evas_object_size_hint_min_set(dia->icon_object, 64, 64); edje_object_part_swallow(dia->bg_object, "e.swallow.icon", dia->icon_object); evas_object_show(dia->icon_object); } diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 1cf5080..fc6cbe3 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -357,7 +357,7 @@ e_shelf_zone_move_resize_handle(E_Zone *zone) if (gc->min_size_request.func) { /* let gadcon container decrease to any size */ - edje_extern_object_min_size_set(gc->o_container, 0, 0); + evas_object_size_hint_min_set(gc->o_container, 0, 0); } evas_object_smart_callback_call(gc->o_container, "min_size_request", NULL); e_shelf_position_calc(es); @@ -365,7 +365,7 @@ e_shelf_zone_move_resize_handle(E_Zone *zone) { evas_object_geometry_get(gc->o_container, NULL, NULL, &w, &h); /* fix gadcon container min size to current geometry */ - edje_extern_object_min_size_set(gc->o_container, w, h); + evas_object_size_hint_min_set(gc->o_container, w, h); } } } diff --git a/src/bin/e_widget_check.c b/src/bin/e_widget_check.c index 133cc96..8399dfd 100644 --- a/src/bin/e_widget_check.c +++ b/src/bin/e_widget_check.c @@ -181,7 +181,7 @@ e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int ico o2 = edje_object_add(evas); e_util_edje_icon_set(o2, icon); } - edje_extern_object_min_size_set(o2, icon_w, icon_h); + evas_object_size_hint_min_set(o2, icon_w, icon_h); edje_object_part_swallow(wd->o_check, "e.swallow.icon", o2); evas_object_show(o2); e_widget_sub_object_add(obj, o2); diff --git a/src/bin/e_widget_frametable.c b/src/bin/e_widget_frametable.c index 1ea5f5d..2434acf 100644 --- a/src/bin/e_widget_frametable.c +++ b/src/bin/e_widget_frametable.c @@ -66,7 +66,7 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col, 99999, 99999 /* max */ ); e_table_size_min_get(wd->o_table, &mw, &mh); - edje_extern_object_min_size_set(wd->o_table, mw, mh); + evas_object_size_hint_min_set(wd->o_table, mw, mh); edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table); edje_object_size_min_calc(wd->o_frame, &mw, &mh); e_widget_size_min_set(obj, mw, mh); @@ -89,7 +89,7 @@ e_widget_frametable_object_append_full(Evas_Object *obj, Evas_Object *sobj, int max_w, max_h ); e_table_size_min_get(wd->o_table, &mw, &mh); - edje_extern_object_min_size_set(wd->o_table, mw, mh); + evas_object_size_hint_min_set(wd->o_table, mw, mh); edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table); edje_object_size_min_calc(wd->o_frame, &mw, &mh); e_widget_size_min_set(obj, mw, mh); @@ -116,7 +116,7 @@ e_widget_frametable_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, 99999, 99999 /* max */ ); e_table_size_min_get(wd->o_table, &mw, &mh); - edje_extern_object_min_size_set(wd->o_table, mw, mh); + evas_object_size_hint_min_set(wd->o_table, mw, mh); edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table); edje_object_size_min_calc(wd->o_frame, &mw, &mh); e_widget_size_min_set(obj, mw, mh); diff --git a/src/bin/e_widget_label.c b/src/bin/e_widget_label.c index ee839b2..b5267db 100644 --- a/src/bin/e_widget_label.c +++ b/src/bin/e_widget_label.c @@ -61,7 +61,7 @@ e_widget_label_text_set(Evas_Object *obj, const char *text) wd = e_widget_data_get(obj); edje_object_part_text_set(wd->text, "e.text.label", text); edje_object_size_min_calc(wd->text, &mw, &mh); - edje_extern_object_min_size_set(wd->text, mw, mh); + evas_object_size_hint_min_set(wd->text, mw, mh); e_widget_size_min_set(obj, mw, mh); } diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c index 8008ea1..e89aaa1 100644 --- a/src/bin/e_widget_toolbar.c +++ b/src/bin/e_widget_toolbar.c @@ -145,7 +145,7 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la edje_object_signal_callback_add(o, "e,action,click", "e", _e_wid_signal_cb1, it); - edje_extern_object_min_size_set(icon, wd->icon_w, wd->icon_h); + evas_object_size_hint_min_set(icon, wd->icon_w, wd->icon_h); if (icon) { edje_object_part_swallow(o, "e.swallow.icon", icon); diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c index 192c41c..c8d5efe 100644 --- a/src/modules/conf/e_conf.c +++ b/src/modules/conf/e_conf.c @@ -180,7 +180,7 @@ e_configure_show(E_Container *con, const char *params) _e_configure_cb_close, eco, NULL); e_widget_on_focus_hook_set(eco->close, _e_configure_focus_cb, eco->win); e_widget_size_min_get(eco->close, &mw, &mh); - edje_extern_object_min_size_set(eco->close, mw, mh); + evas_object_size_hint_min_set(eco->close, mw, mh); edje_object_part_swallow(eco->edje, "e.swallow.button", eco->close); edje_object_size_min_calc(eco->edje, &ew, &eh); e_win_size_min_set(eco->win, ew, eh); @@ -521,7 +521,7 @@ _e_configure_fill_cat_list(void *data, const char *sel) if (num != -1) e_widget_toolbar_item_select(eco->cat_list, num); e_widget_size_min_get(eco->o_list, &mw, &mh); - edje_extern_object_min_size_set(eco->o_list, mw, mh); + evas_object_size_hint_min_set(eco->o_list, mw, mh); } static Eina_Bool diff --git a/src/modules/conf_intl/e_int_config_imc_import.c b/src/modules/conf_intl/e_int_config_imc_import.c index fa8d4ef..514ab08 100644 --- a/src/modules/conf_intl/e_int_config_imc_import.c +++ b/src/modules/conf_intl/e_int_config_imc_import.c @@ -113,7 +113,7 @@ e_int_config_imc_import(E_Config_Dialog *parent) e_widget_list_object_append(o, ofm, 1, 1, 0.5); e_widget_size_min_get(o, &w, &h); - edje_extern_object_min_size_set(o, w, h); + evas_object_size_hint_min_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.content", o); evas_object_show(o); @@ -131,7 +131,7 @@ e_int_config_imc_import(E_Config_Dialog *parent) o = import->box_obj; e_widget_size_min_get(o, &w, &h); - edje_extern_object_min_size_set(o, w, h); + evas_object_size_hint_min_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o); edje_object_size_min_calc(import->bg_obj, &w, &h); diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index 05fedd2..76e45f6 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -309,7 +309,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) o = e_icon_add(e); e_util_icon_theme_set(o, "dialog-warning"); evas_object_show(o); - edje_extern_object_min_size_set(o, 64 * e_scale, 64 * e_scale); + evas_object_size_hint_min_set(o, 64 * e_scale, 64 * e_scale); edje_object_part_swallow(po, "e.swallow.icon", o); objs = eina_list_append(objs, o); @@ -340,7 +340,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) objs = eina_list_append(objs, o); e_box_size_min_get(po, &mw, &mh); - edje_extern_object_min_size_set(po, mw, mh); + evas_object_size_hint_min_set(po, mw, mh); edje_object_part_swallow(po2, "e.swallow.buttons", po); evas_object_data_set(preview, "objects", objs); diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c index 0b5544f..8797f18 100644 --- a/src/modules/conf_theme/e_int_config_theme_import.c +++ b/src/modules/conf_theme/e_int_config_theme_import.c @@ -112,7 +112,7 @@ e_int_config_theme_import(E_Config_Dialog *parent) e_widget_list_object_append(o, ofm, 1, 1, 0.5); e_widget_size_min_get(o, &w, &h); - edje_extern_object_min_size_set(o, w, h); + evas_object_size_hint_min_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.content", o); evas_object_show(o); @@ -131,7 +131,7 @@ e_int_config_theme_import(E_Config_Dialog *parent) o = import->box_obj; e_widget_size_min_get(o, &w, &h); - edje_extern_object_min_size_set(o, w, h); + evas_object_size_hint_min_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o); edje_object_size_min_calc(import->bg_obj, &w, &h); diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c index d146ce2..d0fc227 100644 --- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c @@ -1205,7 +1205,7 @@ wp_browser_new(E_Container *con) e_widget_list_object_append(info->box, info->button, 1, 0, 0.5); e_widget_size_min_get(info->box, &mw, &mh); - edje_extern_object_min_size_set(info->box, mw, mh); + evas_object_size_hint_min_set(info->box, mw, mh); edje_object_part_swallow(info->bg, "e.swallow.buttons", info->box); evas_object_show(info->box); @@ -1288,7 +1288,7 @@ wp_browser_new(E_Container *con) evas_object_show(o); e_widget_size_min_get(ob, &mw, &mh); - edje_extern_object_min_size_set(ob, mw, mh); + evas_object_size_hint_min_set(ob, mw, mh); edje_object_part_swallow(info->bg, "e.swallow.extras", ob); evas_object_show(ob); diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 4218021..e0b8d2f 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -812,7 +812,7 @@ _e_fwin_icon_popup(void *data) e_widget_filepreview_path_set(o, buf, fwin->popup_icon->mime); e_widget_list_object_append(list, o, 1, 0, 0.5); e_widget_size_min_get(list, &mw, &mh); - edje_extern_object_min_size_set(list, mw, mh); + evas_object_size_hint_min_set(list, mw, mh); edje_object_part_swallow(bg, "e.swallow.content", list); edje_object_size_min_calc(bg, &mw, &mh); @@ -939,7 +939,7 @@ _e_fwin_page_favorites_add(E_Fwin_Page *page) e_widget_scrollframe_focus_object_set(o, page->flist); page->flist_frame = o; - edje_extern_object_min_size_set(o, 128, 0); + evas_object_size_hint_min_set(o, 128, 0); edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.favorites", o); } @@ -1526,23 +1526,23 @@ _e_fwin_toolbar_resize(E_Fwin_Page *page) { case E_GADCON_ORIENT_HORIZ: case E_GADCON_ORIENT_TOP: - edje_extern_object_min_size_set(page->tbar->o_base, 0, page->tbar->minh); + evas_object_size_hint_min_set(page->tbar->o_base, 0, page->tbar->minh); edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.toolbar", page->tbar->o_base); edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,top", "e"); break; case E_GADCON_ORIENT_BOTTOM: - edje_extern_object_min_size_set(page->tbar->o_base, 0, page->tbar->minh); + evas_object_size_hint_min_set(page->tbar->o_base, 0, page->tbar->minh); edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.toolbar", page->tbar->o_base); edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,bottom", "e"); break; case E_GADCON_ORIENT_VERT: case E_GADCON_ORIENT_LEFT: - edje_extern_object_min_size_set(page->tbar->o_base, page->tbar->minw, 0); + evas_object_size_hint_min_set(page->tbar->o_base, page->tbar->minw, 0); edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.toolbar", page->tbar->o_base); edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,left", "e"); break; case E_GADCON_ORIENT_RIGHT: - edje_extern_object_min_size_set(page->tbar->o_base, page->tbar->minw, 0); + evas_object_size_hint_min_set(page->tbar->o_base, page->tbar->minw, 0); edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.toolbar", page->tbar->o_base); edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,right", "e"); break; diff --git a/src/modules/illume-indicator/e_mod_ind_win.c b/src/modules/illume-indicator/e_mod_ind_win.c index 2f0ef88..92e5d9e 100644 --- a/src/modules/illume-indicator/e_mod_ind_win.c +++ b/src/modules/illume-indicator/e_mod_ind_win.c @@ -86,7 +86,7 @@ e_mod_ind_win_new(E_Zone *zone) /* create our gadget container */ iwin->gadcon = e_gadcon_swallowed_new("illume-indicator", zone->num, iwin->o_base, "e.swallow.content"); - edje_extern_object_min_size_set(iwin->gadcon->o_container, h, h); + evas_object_size_hint_min_set(iwin->gadcon->o_container, h, h); e_gadcon_min_size_request_callback_set(iwin->gadcon, _e_mod_ind_win_cb_min_size_request, iwin); @@ -251,7 +251,7 @@ _e_mod_ind_win_cb_resize(E_Win *win) if (iwin->o_base) evas_object_resize(iwin->o_base, win->w, win->h); if (iwin->gadcon->o_container) { -// edje_extern_object_min_size_set(iwin->gadcon->o_container, +// evas_object_size_hint_min_set(iwin->gadcon->o_container, // win->w, win->h); } } @@ -433,7 +433,7 @@ _e_mod_ind_win_cb_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w __UNUS if (!(iwin = data)) return; if (gc != iwin->gadcon) return; if (h < iwin->win->h) h = iwin->win->h; -// edje_extern_object_min_size_set(iwin->gadcon->o_container, w, h); +// evas_object_size_hint_min_set(iwin->gadcon->o_container, w, h); } /* static void */ diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index 800d782..adec6c7 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -682,7 +682,7 @@ _shot_now(E_Zone *zone, E_Border *bd) o = e_widget_list_add(evas, 0, 0); o_content = o; e_widget_size_min_get(o, &w, &h); - edje_extern_object_min_size_set(o, w, h); + evas_object_size_hint_min_set(o, w, h); edje_object_part_swallow(o_bg, "e.swallow.content", o); evas_object_show(o); @@ -786,7 +786,7 @@ _shot_now(E_Zone *zone, E_Border *bd) o = o_content; e_widget_size_min_get(o, &w, &h); - edje_extern_object_min_size_set(o, w, h); + evas_object_size_hint_min_set(o, w, h); edje_object_part_swallow(o_bg, "e.swallow.content", o); evas_object_show(o); @@ -806,7 +806,7 @@ _shot_now(E_Zone *zone, E_Border *bd) o = o_box; e_widget_size_min_get(o, &w, &h); - edje_extern_object_min_size_set(o, w, h); + evas_object_size_hint_min_set(o, w, h); edje_object_part_swallow(o_bg, "e.swallow.buttons", o); o = evas_object_rectangle_add(evas); diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c index 01b01f5..507a8b5 100644 --- a/src/modules/syscon/e_syscon.c +++ b/src/modules/syscon/e_syscon.c @@ -274,13 +274,13 @@ e_syscon_show(E_Zone *zone, const char *defact) edje_object_calc_force(o_bg); e_flowlayout_size_min_get(o_flow_main, &mw, &mh); - edje_extern_object_min_size_set(o_flow_main, mw, mh); + evas_object_size_hint_min_set(o_flow_main, mw, mh); edje_object_part_swallow(o_bg, "e.swallow.main", o_flow_main); e_flowlayout_size_min_get(o_flow_secondary, &mw, &mh); - edje_extern_object_min_size_set(o_flow_secondary, mw, mh); + evas_object_size_hint_min_set(o_flow_secondary, mw, mh); edje_object_part_swallow(o_bg, "e.swallow.secondary", o_flow_secondary); e_flowlayout_size_min_get(o_flow_extra, &mw, &mh); - edje_extern_object_min_size_set(o_flow_extra, mw, mh); + evas_object_size_hint_min_set(o_flow_extra, mw, mh); edje_object_part_swallow(o_bg, "e.swallow.extra", o_flow_extra); edje_object_size_min_calc(o_bg, &mw, &mh); diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c index c53d7e0..5b2f3c0 100644 --- a/src/modules/winlist/e_winlist.c +++ b/src/modules/winlist/e_winlist.c @@ -909,10 +909,10 @@ _e_winlist_size_adjust(void) e_box_freeze(_list_object); e_box_size_min_get(_list_object, &mw, &mh); - edje_extern_object_min_size_set(_list_object, mw, mh); + evas_object_size_hint_min_set(_list_object, mw, mh); edje_object_part_swallow(_bg_object, "e.swallow.list", _list_object); edje_object_size_min_calc(_bg_object, &mw, &mh); - edje_extern_object_min_size_set(_list_object, -1, -1); + evas_object_size_hint_min_set(_list_object, -1, -1); edje_object_part_swallow(_bg_object, "e.swallow.list", _list_object); e_box_thaw(_list_object); --