enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

edje: remove use of deprecated functions.

This commit is contained in:
Cedric BAIL 2014-06-07 18:29:17 +02:00
parent 27998c90fe
commit 3f9af38da2
37 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_bg.c
View File

@ -276,12 +276,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");

4
src/bin/e_comp_object.c
View File

@ -2028,8 +2028,8 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h)
//INF("CW RSZ: %dx%d PIX(%dx%d)", w, h, pw, ph);
//if (cw->obj)
//{
//edje_extern_object_max_size_set(cw->obj, pw, ph);
//edje_extern_object_min_size_set(cw->obj, pw, ph);
//evas_object_size_hint_max_set(cw->obj, pw, ph);
//evas_object_size_hint_min_set(cw->obj, pw, ph);
//}
if ((ww != pw) || (hh != ph))
CRI("CW RSZ: %dx%d || PX: %dx%d", ww, hh, pw, ph);

8
src/bin/e_dialog.c
View File

@ -176,7 +176,7 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
}
if (!e_util_icon_theme_set(dia->icon_object, icon))
e_icon_file_edje_set(dia->icon_object, icon, "icon");
edje_extern_object_min_size_set(dia->icon_object, size * e_scale, size * e_scale);
evas_object_size_hint_min_set(dia->icon_object, size * e_scale, size * e_scale);
edje_object_signal_emit(dia->bg_object, "e,state,icon", "e");
edje_object_signal_emit(dia->bg_object, "e,icon,enabled", "e");
}
@ -199,7 +199,7 @@ e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coor
int mw, mh;
dia->content_object = obj;
e_widget_on_focus_hook_set(obj, _e_dialog_cb_wid_on_focus, dia);
edje_extern_object_min_size_set(obj, minw, minh);
evas_object_size_hint_min_set(obj, minw, minh);
edje_object_part_swallow(dia->bg_object, "e.swallow.content", obj);
edje_object_size_min_calc(dia->bg_object, &mw, &mh);
e_win_resize(dia->win, mw, mh);
@ -253,13 +253,13 @@ e_dialog_show(E_Dialog *dia)
if (o)
{
edje_object_size_min_calc(o, &mw, &mh);
edje_extern_object_min_size_set(o, mw, mh);
evas_object_size_hint_min_set(o, mw, mh);
edje_object_part_swallow(dia->bg_object, "e.swallow.content", o);
}
o = dia->box_object;
e_widget_size_min_get(o, &mw, &mh);
edje_extern_object_min_size_set(o, mw, mh);
evas_object_size_hint_min_set(o, mw, mh);
edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o);
edje_object_size_min_calc(dia->bg_object, &mw, &mh);

8
src/bin/e_fm.c
View File

@ -4712,8 +4712,8 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
ic->sd->tmp.obj2 = obj2;
}
/* FIXME: if icons are allowed to have their own size - use it */
edje_extern_object_min_size_set(obj2, _e_fm2_icon_w_get(ic->sd), _e_fm2_icon_h_get(ic->sd));
edje_extern_object_max_size_set(obj2, _e_fm2_icon_w_get(ic->sd), _e_fm2_icon_h_get(ic->sd));
evas_object_size_hint_min_set(obj2, _e_fm2_icon_w_get(ic->sd), _e_fm2_icon_h_get(ic->sd));
evas_object_size_hint_max_set(obj2, _e_fm2_icon_w_get(ic->sd), _e_fm2_icon_h_get(ic->sd));
edje_object_part_swallow(obj, "e.swallow.icon", obj2);
edje_object_size_min_calc(obj, &mw, &mh);
}
@ -4747,8 +4747,8 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
obj2 = evas_object_rectangle_add(evas_object_evas_get(ic->sd->obj));
ic->sd->tmp.obj2 = obj2;
}
edje_extern_object_min_size_set(obj2, ic->sd->config->icon.list.w, ic->sd->config->icon.list.h);
edje_extern_object_max_size_set(obj2, ic->sd->config->icon.list.w, ic->sd->config->icon.list.h);
evas_object_size_hint_min_set(obj2, ic->sd->config->icon.list.w, ic->sd->config->icon.list.h);
evas_object_size_hint_max_set(obj2, ic->sd->config->icon.list.w, ic->sd->config->icon.list.h);
edje_object_part_swallow(obj, "e.swallow.icon", obj2);
edje_object_size_min_calc(obj, &mw, &mh);
ic->w = MAX(mw, ic->sd->w);

4
src/bin/e_gadcon.c
View File

@ -502,7 +502,7 @@ e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
if (gc->edje.o_parent)
{
edje_extern_object_min_size_set(gc->o_container, w, h);
evas_object_size_hint_min_set(gc->o_container, w, h);
edje_object_part_swallow(gc->edje.o_parent, gc->edje.swallow_name,
gc->o_container);
}
@ -3698,7 +3698,7 @@ e_gadcon_layout_pack_min_size_set(Evas_Object *obj, int w, int h)
if (!bi)
{
evas_object_size_hint_min_set(obj, w, h);
edje_extern_object_min_size_set(obj, w, h);
evas_object_size_hint_min_set(obj, w, h);
return;
}
if (bi->sd->horizontal)

2
src/bin/e_gadcon_popup.c
View File

@ -159,7 +159,7 @@ _e_gadcon_popup_size_recalc(E_Gadcon_Popup *pop, Evas_Object *obj)
edje_object_size_min_get(obj, &w, &h);
edje_object_size_min_restricted_calc(obj, &w, &h, w, h);
}
edje_extern_object_min_size_set(obj, w, h);
evas_object_size_hint_min_set(obj, w, h);
edje_object_size_min_calc(pop->o_bg, &pop->w, &pop->h);
evas_object_resize(pop->comp_object, pop->w, pop->h);

12
src/bin/e_ilist.c
View File

@ -540,7 +540,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);
}
@ -574,7 +574,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);
}
@ -621,7 +621,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)
@ -634,7 +634,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);
@ -1360,7 +1360,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);
}
@ -1375,7 +1375,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);
}

2
src/bin/e_int_client_menu.c
View File

@ -998,7 +998,7 @@ _e_client_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
e_menu_item_callback_set(submi, _e_client_menu_cb_sendto, desk);
#ifdef DESKMIRROR_TEST
submi->icon_object = e_deskmirror_add(desk, 0, 0);
edje_extern_object_min_size_set(submi->icon_object, tw, th);
evas_object_size_hint_min_set(submi->icon_object, tw, th);
evas_object_show(submi->icon_object);
#else
e_menu_item_realize_callback_set(submi, _e_client_menu_cb_sendto_icon_pre,

8
src/bin/e_menu.c
View File

@ -1538,7 +1538,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);
@ -1890,7 +1890,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);
@ -1906,8 +1906,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);

2
src/bin/e_module.c
View File

@ -605,7 +605,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);
}

4
src/bin/e_shelf.c
View File

@ -319,7 +319,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);
@ -327,7 +327,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);
}
}
}

2
src/bin/e_widget_check.c
View File

@ -324,7 +324,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);

4
src/bin/e_widget_framelist.c
View File

@ -67,7 +67,7 @@ e_widget_framelist_object_append_full(Evas_Object *obj, Evas_Object *sobj, int f
max_w, max_h
);
e_box_size_min_get(wd->o_box, &mw, &mh);
edje_extern_object_min_size_set(wd->o_box, mw, mh);
evas_object_size_hint_min_set(wd->o_box, mw, mh);
edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_box);
edje_object_size_min_calc(wd->o_frame, &mw, &mh);
e_widget_size_min_set(obj, mw, mh);
@ -93,7 +93,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj)
99999, 99999 /* max */
);
e_box_size_min_get(wd->o_box, &mw, &mh);
edje_extern_object_min_size_set(wd->o_box, mw, mh);
evas_object_size_hint_min_set(wd->o_box, mw, mh);
edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_box);
edje_object_size_min_calc(wd->o_frame, &mw, &mh);
e_widget_size_min_set(obj, mw, mh);

6
src/bin/e_widget_frametable.c
View File

@ -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);

2
src/bin/e_widget_label.c
View File

@ -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);
}

6
src/bin/e_widget_preview.c
View File

@ -35,9 +35,9 @@ e_widget_preview_add(Evas *evas, int minw, int minh)
wd->img = e_livethumb_add(evas);
e_livethumb_vsize_set(wd->img, minw * 2, minh * 2);
edje_extern_object_min_size_set(wd->img, minw, minh);
evas_object_size_hint_min_set(wd->img, minw, minh);
/* Why do we set max size? This prevents from being nicely resized. */
/* edje_extern_object_max_size_set(o, minw, minh); */
/* evas_object_size_hint_max_set(o, minw, minh); */
evas_object_show(wd->img);
e_widget_sub_object_add(obj, wd->img);
edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img);
@ -58,7 +58,7 @@ e_widget_preview_size_set(Evas_Object *obj, int minw, int minh)
wd = e_widget_data_get(obj);
e_livethumb_vsize_set(wd->img, minw * 2, minh * 2);
edje_extern_object_min_size_set(wd->img, minw, minh);
evas_object_size_hint_min_set(wd->img, minw, minh);
edje_object_size_min_calc(wd->o_frame, &mw, &mh);
e_widget_size_min_set(obj, mw, mh);
}

2
src/bin/e_widget_toolbar.c
View File

@ -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);

4
src/modules/conf/e_conf.c
View File

@ -170,7 +170,7 @@ e_configure_show(E_Comp *comp, 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);
@ -511,7 +511,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

4
src/modules/conf_bindings/e_int_config_edgebindings.c
View File

@ -895,7 +895,7 @@ _edge_grab_wnd_show(E_Config_Dialog_Data *cfdata)
edje_object_part_box_append(o, "e.box", os);
evas_object_show(os);
e_widget_size_min_get(os, &minw, &minh);
edje_extern_object_min_size_set(os, minw, minh);
evas_object_size_hint_min_set(os, minw, minh);
cfdata->gui.o_check2 = os = e_widget_check_add(evas, _("Drag only"), &(cfdata->locals.drag_only));
e_widget_size_min_resize(os);
@ -903,7 +903,7 @@ _edge_grab_wnd_show(E_Config_Dialog_Data *cfdata)
edje_object_part_box_append(o, "e.box", os);
evas_object_show(os);
e_widget_size_min_get(os, &minw, &minh);
edje_extern_object_min_size_set(os, minw, minh);
evas_object_size_hint_min_set(os, minw, minh);
e_widget_disabled_set(cfdata->gui.o_slider, cfdata->locals.click);
e_widget_disabled_set(cfdata->gui.o_check2, cfdata->locals.click);

4
src/modules/conf_intl/e_int_config_imc_import.c
View File

@ -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);

2
src/modules/conf_randr/e_smart_monitor.c
View File

@ -1118,7 +1118,7 @@ _e_smart_monitor_mode_refresh_rates_fill(Evas_Object *obj)
{
/* calculate min size for refresh list and set */
e_widget_size_min_get(sd->o_refresh, &mw, &mh);
edje_extern_object_min_size_set(sd->o_refresh, mw, mh);
evas_object_size_hint_min_set(sd->o_refresh, mw, mh);
/* swallow refresh list */
edje_object_part_swallow(sd->o_frame, "e.swallow.refresh", sd->o_refresh);

4
src/modules/conf_theme/e_int_config_theme.c
View File

@ -253,7 +253,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);
@ -284,7 +284,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);

4
src/modules/conf_theme/e_int_config_theme_import.c
View File

@ -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);

4
src/modules/conf_wallpaper2/e_int_config_wallpaper.c
View File

@ -1204,7 +1204,7 @@ wp_browser_new(E_Comp *comp)
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);
@ -1287,7 +1287,7 @@ wp_browser_new(E_Comp *comp)
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);

12
src/modules/fileman/e_fwin.c
View File

@ -861,7 +861,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);
@ -998,7 +998,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);
}
@ -1590,23 +1590,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;

6
src/modules/ibar/e_mod_main.c
View File

@ -1174,7 +1174,7 @@ _ibar_icon_menu_recalc(IBar_Icon *ic)
edje_object_size_min_calc(o, &w, &h);
zone = e_gadcon_zone_get(ic->ibar->inst->gcc->gadcon);
evas_object_geometry_get(ic->o_holder, &x, &y, &iw, &ih);
edje_extern_object_min_size_set(o, w, h);
evas_object_size_hint_min_set(o, w, h);
ic->menu->w = w, ic->menu->h = h;
evas_object_resize(ic->menu->comp_object, w, h);
e_gadcon_popup_show(ic->menu);
@ -1219,7 +1219,7 @@ _ibar_cb_icon_menu_img_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
}
edje_object_calc_force(ic->menu->o_bg);
edje_object_size_min_calc(ic->menu->o_bg, &w, &h);
edje_extern_object_min_size_set(ic->menu->o_bg, w, h);
evas_object_size_hint_min_set(ic->menu->o_bg, w, h);
if (e_box_orientation_get(ic->ibar->o_box))
{
int cx, cy, cw, ch, ny;
@ -1297,7 +1297,7 @@ _ibar_icon_menu_client_add(IBar_Icon *ic, E_Client *ec)
}
edje_object_calc_force(it);
edje_object_size_min_calc(it, &w, &h);
edje_extern_object_min_size_set(it, w, h);
evas_object_size_hint_min_set(it, w, h);
evas_object_size_hint_min_set(it, w, h);
evas_object_show(it);
evas_object_event_callback_add(it, EVAS_CALLBACK_MOUSE_UP, _ibar_cb_icon_menu_mouse_up, ec);

6
src/modules/illume-indicator/e_mod_ind_win.c
View File

@ -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);
}
}
@ -431,7 +431,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 */

4
src/modules/illume-indicator/e_mod_notify.c
View File

@ -147,8 +147,8 @@ _e_mod_notify_refresh(Ind_Notify_Win *nwin)
if (nwin->o_icon)
{
evas_object_resize(nwin->o_icon, size, size);
edje_extern_object_min_size_set(nwin->o_icon, size, size);
edje_extern_object_max_size_set(nwin->o_icon, size, size);
evas_object_size_hint_min_set(nwin->o_icon, size, size);
evas_object_size_hint_max_set(nwin->o_icon, size, size);
edje_object_part_swallow(nwin->o_base, "e.swallow.icon", nwin->o_icon);
}

12
src/modules/illume-keyboard/e_kbd_int.c
View File

@ -328,7 +328,7 @@ _e_kbd_int_matches_update(void *data)
}
e_box_thaw(ki->box_obj);
e_box_size_min_get(ki->box_obj, &mw, &mh);
edje_extern_object_min_size_set(ki->box_obj, 0, mh);
evas_object_size_hint_min_set(ki->box_obj, 0, mh);
edje_object_part_swallow(ki->base_obj, "e.swallow.label", ki->box_obj);
evas_event_thaw(ki->win->evas);
@ -1057,8 +1057,8 @@ _e_kbd_int_layout_build(E_Kbd_Int *ki)
lh = (ki->layout.h * lw) / ki->layout.w;
if (lw > ki->win->w) lw = ki->win->w;
if (lh > ki->win->h) lh = ki->win->h;
edje_extern_object_min_size_set(ki->layout_obj, lw, lh);
edje_extern_object_max_size_set(ki->layout_obj, ki->win->w, ki->win->h);
evas_object_size_hint_min_set(ki->layout_obj, lw, lh);
evas_object_size_hint_max_set(ki->layout_obj, ki->win->w, ki->win->h);
EINA_LIST_FOREACH(ki->layout.keys, l, ky)
{
@ -1534,7 +1534,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
e_widget_ilist_preferred_size_get(o, &mw, &mh);
if (mh < (120 *e_scale)) mh = (120 * e_scale);
edje_extern_object_min_size_set(ki->dictlist.ilist_obj, mw, mh);
evas_object_size_hint_min_set(ki->dictlist.ilist_obj, mw, mh);
edje_object_part_swallow(ki->dictlist.base_obj, "e.swallow.content",
ki->dictlist.ilist_obj);
edje_object_size_min_calc(ki->dictlist.base_obj, &mw, &mh);
@ -1633,12 +1633,12 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
e_widget_ilist_preferred_size_get(o, &mw, &mh);
if (mh < (120 *e_scale)) mh = (120 * e_scale);
edje_extern_object_min_size_set(ki->matchlist.ilist_obj, mw, mh);
evas_object_size_hint_min_set(ki->matchlist.ilist_obj, mw, mh);
edje_object_part_swallow(ki->matchlist.base_obj, "e.swallow.content",
ki->matchlist.ilist_obj);
edje_object_size_min_calc(ki->matchlist.base_obj, &mw, &mh);
edje_extern_object_min_size_set(ki->matchlist.ilist_obj, 0, 0);
evas_object_size_hint_min_set(ki->matchlist.ilist_obj, 0, 0);
edje_object_part_swallow(ki->matchlist.base_obj, "e.swallow.content",
ki->matchlist.ilist_obj);
e_zone_useful_geometry_get(ki->win->client->zone, NULL, NULL, NULL, &sh);

10
src/modules/lokker/lokker.c
View File

@ -298,12 +298,12 @@ _pin_box_add(Lokker_Popup *lp)
e_table_thaw(table);
evas_object_show(table);
e_table_size_min_get(table, &mw, &mh);
edje_extern_object_min_size_set(table, mw, mh);
edje_extern_object_max_size_set(table, mw, mh);
evas_object_size_hint_min_set(table, mw, mh);
evas_object_size_hint_max_set(table, mw, mh);
edje_object_part_swallow(lp->login_box, "e.swallow.buttons", table);
edje_object_size_min_calc(lp->login_box, &mw, &mh);
edje_extern_object_min_size_set(lp->login_box, mw, mh);
edje_extern_object_max_size_set(lp->login_box, mw, mh);
evas_object_size_hint_min_set(lp->login_box, mw, mh);
evas_object_size_hint_max_set(lp->login_box, mw, mh);
}
static void
@ -336,7 +336,7 @@ _text_login_box_add(Lokker_Popup *lp)
edje_object_size_min_calc(lp->login_box, &mw, &mh);
if (edje_object_part_exists(lp->bg_object, "e.swallow.login_box"))
{
edje_extern_object_min_size_set(lp->login_box, mw, mh);
evas_object_size_hint_min_set(lp->login_box, mw, mh);
edje_object_part_swallow(lp->bg_object, "e.swallow.login_box", lp->login_box);
}
else

4
src/modules/notification/e_mod_popup.c
View File

@ -434,8 +434,8 @@ _notification_popup_refresh(Popup_Data *popup)
h = h * height / v;
w = w * width / v;
}
edje_extern_object_min_size_set(popup->app_icon, w, h);
edje_extern_object_max_size_set(popup->app_icon, w, h);
evas_object_size_hint_min_set(popup->app_icon, w, h);
evas_object_size_hint_max_set(popup->app_icon, w, h);
edje_object_part_swallow(popup->theme, "notification.swallow.app_icon",
popup->app_icon);

2
src/modules/pager/e_mod_main.c
View File

@ -803,7 +803,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
if (desk)
edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name);
edje_extern_object_min_size_set(pp->pager->o_table, width, height);
evas_object_size_hint_min_set(pp->pager->o_table, width, height);
edje_object_part_swallow(pp->o_bg, "e.swallow.content", pp->pager->o_table);
edje_object_size_min_calc(pp->o_bg, &w, &h);

2
src/modules/pager16/e_mod_main.c
View File

@ -779,7 +779,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
if (desk)
edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name);
edje_extern_object_min_size_set(pp->pager->o_table, width, height);
evas_object_size_hint_min_set(pp->pager->o_table, width, height);
edje_object_part_swallow(pp->o_bg, "e.swallow.content", pp->pager->o_table);
edje_object_size_min_calc(pp->o_bg, &w, &h);

6
src/modules/shot/e_mod_main.c
View File

@ -725,7 +725,7 @@ _shot_now(E_Zone *zone, E_Client *ec, const char *params)
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);
@ -829,7 +829,7 @@ _shot_now(E_Zone *zone, E_Client *ec, const char *params)
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);
@ -849,7 +849,7 @@ _shot_now(E_Zone *zone, E_Client *ec, const char *params)
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);

6
src/modules/syscon/e_syscon.c
View File

@ -250,13 +250,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);

4
src/modules/winlist/e_winlist.c
View File

@ -753,10 +753,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);

2
src/modules/wizard/e_wizard.c
View File

@ -149,7 +149,7 @@ e_wizard_page_show(Evas_Object *obj)
Evas_Coord minw = 0, minh = 0;
e_widget_size_min_get(obj, &minw, &minh);
edje_extern_object_min_size_set(obj, minw, minh);
evas_object_size_hint_min_set(obj, minw, minh);
edje_object_part_swallow(o_bg, "e.swallow.content", obj);
evas_object_show(obj);
e_widget_focus_set(obj, 1);