From 6ab63682dde0e8ae67faa2ca8c19ce149cd5e668 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 1 Sep 2009 13:34:42 +0000 Subject: [PATCH] Fix API Inconsistency in regards to e_widget_min_size_* . Renamed to e_widget_size_min_* . This Large commit should fix everything in svn that is using those functions. SVN revision: 42152 --- src/bin/e_color_dialog.c | 2 +- src/bin/e_config.c | 2 +- src/bin/e_config_dialog.c | 10 ++--- src/bin/e_dialog.c | 2 +- src/bin/e_eap_editor.c | 8 ++-- src/bin/e_entry_dialog.c | 2 +- src/bin/e_exec.c | 2 +- src/bin/e_fm.c | 2 +- src/bin/e_fm_prop.c | 12 +++--- src/bin/e_gadcon_popup.c | 2 +- src/bin/e_int_border_prop.c | 6 +-- src/bin/e_int_config_modules.c | 6 +-- src/bin/e_int_gadcon_config.c | 10 ++--- src/bin/e_int_shelf_config.c | 8 ++-- src/bin/e_ipc_codec.c | 12 +++--- src/bin/e_test.c | 14 +++---- src/bin/e_widget.c | 41 +++++++++---------- src/bin/e_widget.h | 6 +-- src/bin/e_widget_aspect.c | 4 +- src/bin/e_widget_button.c | 2 +- src/bin/e_widget_check.c | 4 +- src/bin/e_widget_color_well.c | 2 +- src/bin/e_widget_config_list.c | 12 +++--- src/bin/e_widget_csel.c | 2 +- src/bin/e_widget_cslider.c | 2 +- src/bin/e_widget_desk_preview.c | 4 +- src/bin/e_widget_entry.c | 2 +- src/bin/e_widget_flist.c | 2 +- src/bin/e_widget_font_preview.c | 2 +- src/bin/e_widget_framelist.c | 6 +-- src/bin/e_widget_frametable.c | 6 +-- src/bin/e_widget_fsel.c | 16 ++++---- src/bin/e_widget_ilist.c | 6 +-- src/bin/e_widget_image.c | 10 ++--- src/bin/e_widget_label.c | 2 +- src/bin/e_widget_list.c | 4 +- src/bin/e_widget_preview.c | 4 +- src/bin/e_widget_radio.c | 4 +- src/bin/e_widget_scrollframe.c | 2 +- src/bin/e_widget_slider.c | 4 +- src/bin/e_widget_spectrum.c | 2 +- src/bin/e_widget_table.c | 8 ++-- src/bin/e_widget_textblock.c | 2 +- src/bin/e_widget_toolbar.c | 10 ++--- src/bin/e_widget_toolbook.c | 4 +- src/modules/conf/e_conf.c | 16 ++++---- .../conf_applications/e_int_config_apps.c | 24 +++++------ .../conf_borders/e_int_config_borders.c | 4 +- .../conf_colors/e_int_config_color_classes.c | 4 +- .../conf_desklock/e_int_config_desklock.c | 2 +- .../conf_display/e_int_config_display.c | 4 +- .../e_int_config_edgebindings.c | 4 +- src/modules/conf_fonts/e_int_config_fonts.c | 14 +++---- .../e_int_config_icon_themes.c | 2 +- src/modules/conf_imc/e_int_config_imc.c | 4 +- .../conf_imc/e_int_config_imc_import.c | 4 +- src/modules/conf_intl/e_int_config_intl.c | 14 +++---- .../e_int_config_keybindings.c | 4 +- src/modules/conf_mime/e_int_config_mime.c | 10 ++--- .../conf_mime/e_int_config_mime_edit.c | 6 +-- .../e_int_config_mousebindings.c | 4 +- src/modules/conf_paths/e_int_config_paths.c | 4 +- .../conf_profiles/e_int_config_profiles.c | 10 ++--- src/modules/conf_shelves/e_int_config_shelf.c | 4 +- .../conf_startup/e_int_config_startup.c | 2 +- src/modules/conf_theme/e_int_config_theme.c | 6 +-- .../conf_theme/e_int_config_theme_import.c | 4 +- .../e_int_config_transitions.c | 4 +- .../conf_wallpaper/e_int_config_wallpaper.c | 4 +- .../e_int_config_wallpaper_gradient.c | 4 +- .../e_int_config_wallpaper_import.c | 8 ++-- .../conf_wallpaper2/e_int_config_wallpaper.c | 4 +- .../e_int_config_remembers.c | 4 +- src/modules/connman/e_mod_main.c | 20 ++++----- src/modules/everything/evry_config.c | 4 +- src/modules/fileman/e_fwin.c | 6 +-- src/modules/gadman/e_mod_config.c | 6 +-- src/modules/ibar/e_mod_config.c | 2 +- src/modules/illume/e_cfg.c | 2 +- src/modules/mixer/app_mixer.c | 6 +-- src/modules/mixer/conf_gadget.c | 6 +-- src/modules/mixer/e_mod_main.c | 4 +- src/modules/wizard/e_wizard.c | 2 +- src/modules/wizard/page_010.c | 2 +- src/modules/wizard/page_020.c | 4 +- src/modules/wizard/page_030.c | 4 +- src/modules/wizard/page_040.c | 2 +- src/modules/wizard/page_070.c | 4 +- src/modules/wizard/page_080.c | 4 +- 89 files changed, 265 insertions(+), 266 deletions(-) diff --git a/src/bin/e_color_dialog.c b/src/bin/e_color_dialog.c index 29705b6b3..2a3673e60 100644 --- a/src/bin/e_color_dialog.c +++ b/src/bin/e_color_dialog.c @@ -40,7 +40,7 @@ e_color_dialog_new(E_Container *con, const E_Color *color) o = e_widget_csel_add(dia->dia->win->evas, dia->color); evas_object_show(o); - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); e_dialog_content_set(dia->dia, o, 460, 260); e_widget_on_change_hook_set(o, _e_color_dialog_cb_csel_change, dia); diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 737ab2871..98b3c1aca 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -11,7 +11,7 @@ EAPI E_Config *e_config = NULL; -static int _e_config_revisions = 9; +static int _e_config_revisions = 0; /* local subsystem functions */ static void _e_config_save_cb(void *data); diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c index d2baf7211..37ff0622b 100644 --- a/src/bin/e_config_dialog.c +++ b/src/bin/e_config_dialog.c @@ -197,7 +197,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type) ob = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata); if (cfd->view->scroll) { - e_widget_min_size_resize(ob); + e_widget_size_min_resize(ob); sf = e_widget_scrollframe_simple_add(evas, ob); e_widget_list_object_append(o, sf, 1, 1, 0.0); } @@ -213,7 +213,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type) o = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata); if (cfd->view->scroll) { - e_widget_min_size_resize(o); + e_widget_size_min_resize(o); o = e_widget_scrollframe_simple_add(evas, o); } } @@ -226,7 +226,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type) ob = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata); if (cfd->view->scroll) { - e_widget_min_size_resize(ob); + e_widget_size_min_resize(ob); sf = e_widget_scrollframe_simple_add(evas, ob); e_widget_list_object_append(o, sf, 1, 1, 0.0); } @@ -242,13 +242,13 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type) o = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata); if (cfd->view->scroll) { - e_widget_min_size_resize(o); + e_widget_size_min_resize(o); o = e_widget_scrollframe_simple_add(evas, o); } } } - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd); e_dialog_content_set(cfd->dia, o, mw, mh); diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c index 191890da3..761849eb0 100644 --- a/src/bin/e_dialog.c +++ b/src/bin/e_dialog.c @@ -234,7 +234,7 @@ e_dialog_show(E_Dialog *dia) } o = dia->box_object; - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); edje_extern_object_min_size_set(o, mw, mh); edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o); diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index f5de98395..2e813fb7a 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -463,7 +463,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_ e_widget_button_add(evas, "", NULL, _e_desktop_editor_cb_icon_select, cfdata, editor); _e_desktop_editor_icon_update(cfdata); - e_widget_min_size_set(editor->img_widget, 48, 48); + e_widget_size_min_set(editor->img_widget, 48, 48); e_widget_frametable_object_append(o, editor->img_widget, 0, 0, 1, 1, 0, 0, 1, 1); @@ -474,7 +474,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_ 0, 0, 1, 1, 1, 1, 1, 1); entry = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL); - e_widget_min_size_set(entry, 100, 1); + e_widget_size_min_set(entry, 100, 1); e_widget_frametable_object_append(o, entry, 1, 0, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Executable")), 0, 1, 1, 1, 1, 1, 1, 1); @@ -606,7 +606,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2) evas_object_show(o); editor->icon_fsel = o; - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); /* buttons at the bottom */ @@ -670,7 +670,7 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2) evas_object_show(o); editor->exec_fsel = o; - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); /* buttons at the bottom */ diff --git a/src/bin/e_entry_dialog.c b/src/bin/e_entry_dialog.c index d285c896f..58f1296a0 100644 --- a/src/bin/e_entry_dialog.c +++ b/src/bin/e_entry_dialog.c @@ -56,7 +56,7 @@ e_entry_dialog_show(const char *title, const char *icon, const char *text, ed->entry = e_widget_entry_add(dia->win->evas, &(ed->text), NULL, NULL, NULL); evas_object_smart_callback_add(ed->entry, "key_down", _e_entry_cb_key_down, ed); e_widget_list_object_append(o, ed->entry, 1, 1, 0.5); - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); e_dialog_content_set(dia, o, w, h); e_dialog_button_add(dia, !button_text ? _("OK") : button_text, NULL, _e_entry_dialog_ok, ed); diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index 1e422e0ac..f1e12ba44 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -598,7 +598,7 @@ _dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *li e_widget_textblock_plain_set(obj, text); } - e_widget_min_size_set(obj, 240, 120); + e_widget_size_min_set(obj, 240, 120); e_widget_framelist_object_append(os, obj); diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 46beb807a..de75e2004 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -8560,7 +8560,7 @@ _e_fm2_view_image_sel(E_Fm2_Smart_Data *sd, const char *title, o = e_widget_fsel_add(dia->win->evas, "/", sd->realpath, NULL, NULL, NULL, sd, NULL, sd, 1); evas_object_show(o); - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); e_dialog_content_set(dia, o, w, h); dia->data = o; diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c index 156e46325..b21335755 100644 --- a/src/bin/e_fm_prop.c +++ b/src/bin/e_fm_prop.c @@ -337,28 +337,28 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ob = e_widget_label_add(evas, _("File:")); e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0); ob = e_widget_entry_add(evas, &(cfdata->file), NULL, NULL, NULL); - e_widget_min_size_set(ob, 140, -1); + e_widget_size_min_set(ob, 140, -1); e_widget_entry_readonly_set(ob, 1); e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add(evas, _("Size:")); e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_entry_add(evas, &(cfdata->size), NULL, NULL, NULL); - e_widget_min_size_set(ob, 140, -1); + e_widget_size_min_set(ob, 140, -1); e_widget_entry_readonly_set(ob, 1); e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add(evas, _("Last Modified:")); e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0); ob = e_widget_entry_add(evas, &(cfdata->mod_date), NULL, NULL, NULL); - e_widget_min_size_set(ob, 140, -1); + e_widget_size_min_set(ob, 140, -1); e_widget_entry_readonly_set(ob, 1); e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add(evas, _("File Type:")); e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0); ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL); - e_widget_min_size_set(ob, 140, -1); + e_widget_size_min_set(ob, 140, -1); e_widget_entry_readonly_set(ob, 1); e_widget_table_object_append(ot, ob, 1, 3, 1, 1, 1, 0, 1, 0); @@ -366,7 +366,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ob = e_widget_label_add(evas, _("Owner:")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); ob = e_widget_entry_add(evas, &(cfdata->owner), NULL, NULL, NULL); - e_widget_min_size_set(ob, 60, -1); + e_widget_size_min_set(ob, 60, -1); e_widget_entry_readonly_set(ob, 1); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); ob = e_widget_check_add(evas, _("Others can read"), &(cfdata->others_read)); @@ -506,7 +506,7 @@ _cb_icon_sel(void *data, void *data2) cfdata->gui.fsel_wid = o; evas_object_show(o); - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); e_dialog_content_set(dia, o, w, h); e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata); diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c index eb50eeb09..bfeaa2122 100644 --- a/src/bin/e_gadcon_popup.c +++ b/src/bin/e_gadcon_popup.c @@ -148,7 +148,7 @@ _e_gadcon_popup_size_recalc(E_Gadcon_Popup *pop, Evas_Object *obj) { Evas_Coord w = 0, h = 0; - e_widget_min_size_get(obj, &w, &h); + e_widget_size_min_get(obj, &w, &h); if ((!w) || (!h)) evas_object_size_hint_min_get(obj, &w, &h); if ((!w) || (!h)) { diff --git a/src/bin/e_int_border_prop.c b/src/bin/e_int_border_prop.c index b097a0b63..7465d8390 100644 --- a/src/bin/e_int_border_prop.c +++ b/src/bin/e_int_border_prop.c @@ -373,7 +373,7 @@ _bd_go(void *data, void *data2) e_widget_list_object_append(c, ob, 0, 0, 1.0); - e_widget_min_size_get(c, &w, &h); + e_widget_size_min_get(c, &w, &h); e_dialog_content_set(dia, c, w, h); e_dialog_show(dia); } @@ -387,8 +387,8 @@ _bd_go(void *data, void *data2) ob = e_widget_entry_add(evas, &(cfdata->val), NULL, NULL, NULL); \ if (!cfdata->val) e_widget_disabled_set(ob, 1); \ e_widget_entry_readonly_set(ob, 1); \ - e_widget_min_size_get(ob, &mw, &mh); \ - e_widget_min_size_set(ob, 160, mh); \ + e_widget_size_min_get(ob, &mw, &mh); \ + e_widget_size_min_set(ob, 160, mh); \ e_widget_frametable_object_append(of, ob, x + 1, y, 1, 1, 1, 1, 1, 1); \ } #define CHK_ENTRY(label, x, y, val) \ diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index 655a39718..e26b1f09a 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -206,7 +206,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1); ol = e_widget_textblock_add(evas); - e_widget_min_size_set(ol, 200, 70); + e_widget_size_min_set(ol, 200, 70); cfdata->o_desc = ol; e_widget_textblock_markup_set(ol, _("Description: Unavailable")); e_widget_table_object_append(o, ol, 0, 1, 2, 1, 1, 0, 1, 0); @@ -338,8 +338,8 @@ _fill_list(Evas_Object *obj, int enabled) } e_widget_ilist_go(obj); - e_widget_min_size_get(obj, &w, NULL); - e_widget_min_size_set(obj, w > 180 ? w : 180, 200); + e_widget_size_min_get(obj, &w, NULL); + e_widget_size_min_set(obj, w > 180 ? w : 180, 200); e_widget_ilist_thaw(obj); edje_thaw(); evas_event_thaw(evas); diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c index 90201aeab..d2b1ed218 100644 --- a/src/bin/e_int_gadcon_config.c +++ b/src/bin/e_int_gadcon_config.c @@ -144,7 +144,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1); ow = e_widget_textblock_add(evas); - e_widget_min_size_set(ow, 200, 70); + e_widget_size_min_set(ow, 200, 70); e_widget_textblock_markup_set(ow, _("Description: Unavailable")); cfdata->o_desc = ow; e_widget_table_object_append(o, ow, 0, 1, 2, 1, 1, 1, 1, 0); @@ -244,9 +244,9 @@ _load_avail_gadgets(void *data) (void *)cc->name, NULL); } e_widget_ilist_go(cfdata->o_avail); - e_widget_min_size_get(cfdata->o_avail, &w, NULL); + e_widget_size_min_get(cfdata->o_avail, &w, NULL); if (w < 200) w = 200; - e_widget_min_size_set(cfdata->o_avail, w, 250); + e_widget_size_min_set(cfdata->o_avail, w, 250); e_widget_ilist_thaw(cfdata->o_avail); edje_thaw(); evas_event_thaw(evas); @@ -289,9 +289,9 @@ _load_sel_gadgets(void *data) } } e_widget_ilist_go(cfdata->o_sel); - e_widget_min_size_get(cfdata->o_sel, &w, NULL); + e_widget_size_min_get(cfdata->o_sel, &w, NULL); if (w < 200) w = 200; - e_widget_min_size_set(cfdata->o_sel, w, 250); + e_widget_size_min_set(cfdata->o_sel, w, 250); e_widget_ilist_thaw(cfdata->o_sel); edje_thaw(); evas_event_thaw(evas); diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c index fd79c9b9a..136920789 100644 --- a/src/bin/e_int_shelf_config.c +++ b/src/bin/e_int_shelf_config.c @@ -664,8 +664,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data if (!strcmp(cfdata->es->style, style)) sel = n; n++; } - e_widget_min_size_get(oi, &wmw, &wmh); - e_widget_min_size_set(oi, wmw, 160); + e_widget_size_min_get(oi, &wmw, &wmh); + e_widget_size_min_set(oi, wmw, 160); e_widget_ilist_go(oi); e_widget_ilist_selected_set(oi, sel); @@ -730,8 +730,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data cfdata->desk_sel_list = ob; e_widget_ilist_multi_select_set(ob, 1); _desk_sel_list_load(cfdata); - e_widget_min_size_get(ob, &wmw, &wmh); - e_widget_min_size_set(ob, wmw, 64); + e_widget_size_min_get(ob, &wmw, &wmh); + e_widget_size_min_set(ob, wmw, 64); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o2, of, 1, 1, 0.5); diff --git a/src/bin/e_ipc_codec.c b/src/bin/e_ipc_codec.c index 8a4b31b7d..ade749f02 100644 --- a/src/bin/e_ipc_codec.c +++ b/src/bin/e_ipc_codec.c @@ -42,13 +42,13 @@ _e_ipc_codec_eina_hash_add(void *hash, const void *key, void *data) #define E_IPC_DD_NEW(str, typ) \ eet_data_descriptor_new(str, sizeof(typ), \ - (void *(*) (void *))eina_list_next, \ - (void *(*) (void *, void *))eina_list_append, \ - (void *(*) (void *))eina_list_data_get, \ - (void *(*) (void *))eina_list_free, \ + (void *(*) (void *))eina_list_next, \ + (void *(*) (void *, void *))eina_list_append, \ + (void *(*) (void *))eina_list_data_get, \ + (void *(*) (void *))eina_list_free, \ (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))eina_hash_foreach, \ - (void *(*) (void *, const char *, void *))_e_ipc_codec_eina_hash_add, \ - (void (*) (void *))eina_hash_free) + (void *(*) (void *, const char *, void *))_e_ipc_codec_eina_hash_add, \ + (void (*) (void *))eina_hash_free) /* externally accessible functions */ EAPI int diff --git a/src/bin/e_test.c b/src/bin/e_test.c index c26c4b79e..dcef4a1eb 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -548,7 +548,7 @@ _e_test_internal(E_Container *con) of = e_widget_scrollframe_pan_add(dia->win->evas, ofm, e_fm2_pan_set, e_fm2_pan_get, e_fm2_pan_max_get, e_fm2_pan_child_size_get); - e_widget_min_size_set(of, 128, 128); + e_widget_size_min_set(of, 128, 128); e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1); evas_object_show(ofm); evas_object_show(of); @@ -583,14 +583,14 @@ _e_test_internal(E_Container *con) of = e_widget_scrollframe_pan_add(dia->win->evas, ofm, e_fm2_pan_set, e_fm2_pan_get, e_fm2_pan_max_get, e_fm2_pan_child_size_get); - e_widget_min_size_set(of, 128, 128); + e_widget_size_min_set(of, 128, 128); e_widget_table_object_append(ot, of, 0, 1, 1, 1, 0, 1, 0, 1); evas_object_show(ofm); evas_object_show(of); /* show and pack table */ evas_object_show(ot); - e_widget_min_size_get(ot, &mw, &mh); + e_widget_size_min_get(ot, &mw, &mh); e_dialog_content_set(dia, ot, mw, mh); /* buttons at the bottom */ @@ -629,7 +629,7 @@ _e_test_internal(E_Container *con) _e_test_cb_selected, dia, _e_test_cb_changed, dia, 0); evas_object_show(o); - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); /* buttons at the bottom */ @@ -715,7 +715,7 @@ _e_test_internal(E_Container *con) e_scrollframe_child_set(of, ob); evas_object_show(ob); -// e_widget_min_size_get(o, &mw, &mh); +// e_widget_size_min_get(o, &mw, &mh); mw = 300; mh = 300; e_dialog_content_set(dia, of, mw, mh); evas_object_show(of); @@ -782,7 +782,7 @@ _e_test_timer(void *data) e_widget_toolbar_item_select(o, 1); /* fixme... more */ - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); evas_object_show(o); @@ -849,7 +849,7 @@ _e_test_timer(void *data) e_widget_toolbar_item_select(o, 1); /* fixme... more */ - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); evas_object_show(o); diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c index 4c4aa9774..c3f7b789d 100644 --- a/src/bin/e_widget.c +++ b/src/bin/e_widget.c @@ -10,24 +10,23 @@ typedef struct _E_Smart_Data E_Smart_Data; struct _E_Smart_Data { - Evas_Object *parent_obj; - Evas_Coord x, y, w, h; - Evas_Coord minw, minh; - Eina_List *subobjs; - Evas_Object *resize_obj; - void (*del_func) (Evas_Object *obj); - void (*focus_func) (Evas_Object *obj); - void (*activate_func) (Evas_Object *obj); - void (*disable_func) (Evas_Object *obj); - void (*on_focus_func) (void *data, Evas_Object *obj); - void *on_focus_data; - void (*on_change_func) (void *data, Evas_Object *obj); - void *on_change_data; - void *data; - unsigned char can_focus : 1; - unsigned char child_can_focus : 1; - unsigned char focused : 1; - unsigned char disabled : 1; + Evas_Object *parent_obj; + Evas_Coord x, y, w, h, minw, minh; + Eina_List *subobjs; + Evas_Object *resize_obj; + void (*del_func) (Evas_Object *obj); + void (*focus_func) (Evas_Object *obj); + void (*activate_func) (Evas_Object *obj); + void (*disable_func) (Evas_Object *obj); + void (*on_focus_func) (void *data, Evas_Object *obj); + void *on_focus_data; + void (*on_change_func) (void *data, Evas_Object *obj); + void *on_change_data; + void *data; + unsigned char can_focus : 1; + unsigned char child_can_focus : 1; + unsigned char focused : 1; + unsigned char disabled : 1; }; /* local subsystem functions */ @@ -113,7 +112,7 @@ e_widget_data_get(Evas_Object *obj) } EAPI void -e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh) +e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh) { API_ENTRY return; if (minw >= 0) sd->minw = minw; @@ -121,7 +120,7 @@ e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh) } EAPI void -e_widget_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) +e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) { API_ENTRY return; if (minw) *minw = sd->minw; @@ -463,7 +462,7 @@ e_widget_pointer_get(Evas_Object *obj) } EAPI void -e_widget_min_size_resize(Evas_Object *obj) +e_widget_size_min_resize(Evas_Object *obj) { API_ENTRY return; evas_object_resize(obj, sd->minw, sd->minh); diff --git a/src/bin/e_widget.h b/src/bin/e_widget.h index f51b943fa..87877bc9c 100644 --- a/src/bin/e_widget.h +++ b/src/bin/e_widget.h @@ -15,8 +15,8 @@ EAPI void e_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data, EAPI void e_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); EAPI void e_widget_data_set(Evas_Object *obj, void *data); EAPI void *e_widget_data_get(Evas_Object *obj); -EAPI void e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh); -EAPI void e_widget_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); +EAPI void e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh); +EAPI void e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); EAPI void e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj); EAPI void e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj); EAPI void e_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj); @@ -34,7 +34,7 @@ EAPI void e_widget_change(Evas_Object *obj); EAPI void e_widget_disabled_set(Evas_Object *obj, int disabled); EAPI int e_widget_disabled_get(Evas_Object *obj); EAPI E_Pointer *e_widget_pointer_get(Evas_Object *obj); -EAPI void e_widget_min_size_resize(Evas_Object *obj); +EAPI void e_widget_size_min_resize(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_widget_aspect.c b/src/bin/e_widget_aspect.c index 045415237..480ff0e7b 100644 --- a/src/bin/e_widget_aspect.c +++ b/src/bin/e_widget_aspect.c @@ -125,8 +125,8 @@ e_widget_aspect_child_set(Evas_Object *obj, Evas_Object *child) if (!wd) return; wd->child = child; - e_widget_min_size_get(child, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_get(child, &mw, &mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, child); _e_wid_reconfigure(wd); } diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c index e8c7df111..a96708223 100644 --- a/src/bin/e_widget_button.c +++ b/src/bin/e_widget_button.c @@ -81,7 +81,7 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func _e_wid_button_state_send(wd); edje_object_size_min_calc(wd->o_button, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); return obj; } diff --git a/src/bin/e_widget_check.c b/src/bin/e_widget_check.c index c52841afc..be18e3c6f 100644 --- a/src/bin/e_widget_check.c +++ b/src/bin/e_widget_check.c @@ -47,7 +47,7 @@ e_widget_check_add(Evas *evas, const char *label, int *val) edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); if (wd->valptr) { if (*(wd->valptr)) edje_object_signal_emit(o, "e,state,checked", "e"); @@ -138,7 +138,7 @@ e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int ico } edje_object_size_min_calc(o, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); if (wd->valptr) { if (*(wd->valptr)) edje_object_signal_emit(o, "e,state,checked", "e"); diff --git a/src/bin/e_widget_color_well.c b/src/bin/e_widget_color_well.c index 3a1971c3d..c219f8a75 100644 --- a/src/bin/e_widget_color_well.c +++ b/src/bin/e_widget_color_well.c @@ -152,7 +152,7 @@ e_widget_color_well_add(Evas *evas, E_Color *color, int show_color_dialog) evas_object_show(o); wd->o_edje = o; - e_widget_min_size_set(obj, 50, 50); + e_widget_size_min_set(obj, 50, 50); o = evas_object_rectangle_add(evas); e_widget_sub_object_add(obj, o); diff --git a/src/bin/e_widget_config_list.c b/src/bin/e_widget_config_list.c index 099077b7d..41d13b9ab 100644 --- a/src/bin/e_widget_config_list.c +++ b/src/bin/e_widget_config_list.c @@ -57,7 +57,7 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, o = func_entry_add(evas, &(wd->cur_entry), NULL, NULL, NULL); wd->gui.entry = o; e_widget_disabled_set(o, 1); - e_widget_min_size_set(o, 100, 25); + e_widget_size_min_set(o, 100, 25); e_widget_table_object_append(wd->gui.table, o, 0, 2, 2, 1, 1, 0, 1, 0); o = e_widget_button_add(evas, _("Add"), "list-add", _button_cb_add, @@ -75,7 +75,7 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, o = e_widget_ilist_add(evas, 0, 0, NULL); wd->gui.list = o; e_widget_disabled_set(o, 1); - e_widget_min_size_set(o, 80, 40); + e_widget_size_min_set(o, 80, 40); e_widget_on_change_hook_set(o, _list_cb_change, wd); e_widget_ilist_go(o); e_widget_table_object_append(wd->gui.table, o, 0, 4, 2, 1, 1, 1, 1, 1); @@ -92,8 +92,8 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, e_widget_disabled_set(o, 1); e_widget_table_object_append(wd->gui.table, o, 1, 5, 1, 1, 1, 0, 1, 0); - e_widget_min_size_get(wd->gui.table, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_get(wd->gui.table, &mw, &mh); + e_widget_size_min_set(obj, mw, mh); e_widget_resize_object_set(obj, wd->gui.table); return obj; @@ -150,8 +150,8 @@ e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col, e_widget_table_object_append(wd->gui.table, sobj, col, row, colspan, rowspan, fill_w, fill_h, expand_w, expand_h); - e_widget_min_size_get(wd->gui.table, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_get(wd->gui.table, &mw, &mh); + e_widget_size_min_set(obj, mw, mh); } /* Private Function defs */ diff --git a/src/bin/e_widget_csel.c b/src/bin/e_widget_csel.c index e0b538aed..c1aa18e7e 100644 --- a/src/bin/e_widget_csel.c +++ b/src/bin/e_widget_csel.c @@ -266,7 +266,7 @@ e_widget_csel_add(Evas *evas, E_Color *color) o = e_widget_cslider_add(evas, wd->mode, wd->cv, 1, 1); e_widget_sub_object_add(obj, o); e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd); - e_widget_min_size_set(o, 30, 50); + e_widget_size_min_set(o, 30, 50); evas_object_show(o); wd->vert = o; e_widget_table_object_append(table, o, 2, 1, 1, 1, 0, 1, 0, 1); diff --git a/src/bin/e_widget_cslider.c b/src/bin/e_widget_cslider.c index b6f362aeb..ac6694f12 100644 --- a/src/bin/e_widget_cslider.c +++ b/src/bin/e_widget_cslider.c @@ -67,7 +67,7 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver edje_object_signal_emit(o, "e,state,direction,h", "e"); evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, o); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj); diff --git a/src/bin/e_widget_desk_preview.c b/src/bin/e_widget_desk_preview.c index 20398a4eb..c193814e2 100644 --- a/src/bin/e_widget_desk_preview.c +++ b/src/bin/e_widget_desk_preview.c @@ -171,7 +171,7 @@ _e_wid_reconfigure(E_Widget_Data *wd) E_Widget_Desk_Data *dd = e_widget_data_get(dw); if (dd->x < nx && dd->y < ny) { - e_widget_min_size_set(dw, mw, mh); + e_widget_size_min_set(dw, mw, mh); e_widget_table_object_repack(wd->table, dw, dd->x, dd->y, 1, 1, 1, 1, 1, 1); e_thumb_icon_size_set(dd->thumb, tw, th); e_thumb_icon_rethumb(dd->thumb); @@ -198,7 +198,7 @@ _e_wid_reconfigure(E_Widget_Data *wd) Evas_Object *dw; dw = e_widget_deskpreview_desk_add(evas_object_evas_get(wd->obj), zone, x, y, tw, th); - e_widget_min_size_set(dw, mw, mh); + e_widget_size_min_set(dw, mw, mh); e_widget_table_object_append(wd->table, dw, x, y, 1, 1, 1, 1, 1, 1); wd->desks = eina_list_append(wd->desks, dw); diff --git a/src/bin/e_widget_entry.c b/src/bin/e_widget_entry.c index 21165cc01..491f01e95 100644 --- a/src/bin/e_widget_entry.c +++ b/src/bin/e_widget_entry.c @@ -64,7 +64,7 @@ EAPI Evas_Object e_entry_text_set(o, *text_location); e_entry_min_size_get(o, &minw, &minh); - e_widget_min_size_set(obj, minw, minh); + e_widget_size_min_set(obj, minw, minh); wd->func = func; wd->data = data; diff --git a/src/bin/e_widget_flist.c b/src/bin/e_widget_flist.c index 9db29f306..2bb1dafd2 100644 --- a/src/bin/e_widget_flist.c +++ b/src/bin/e_widget_flist.c @@ -80,7 +80,7 @@ e_widget_flist_add(Evas *evas) _e_wid_cb_selected, obj); evas_object_resize(obj, 32, 32); - e_widget_min_size_set(obj, 32, 32); + e_widget_size_min_set(obj, 32, 32); return obj; } diff --git a/src/bin/e_widget_font_preview.c b/src/bin/e_widget_font_preview.c index 98d414b6e..76f4d22f5 100644 --- a/src/bin/e_widget_font_preview.c +++ b/src/bin/e_widget_font_preview.c @@ -50,7 +50,7 @@ e_widget_font_preview_add(Evas *evas, const char *text) edje_object_part_text_set(wd->o_text, "e.fontpreview.text", text); evas_object_resize(obj, 40, 40); - e_widget_min_size_set(obj, 40, 40); + e_widget_size_min_set(obj, 40, 40); return obj; } diff --git a/src/bin/e_widget_framelist.c b/src/bin/e_widget_framelist.c index 4fd668251..19ae8f196 100644 --- a/src/bin/e_widget_framelist.c +++ b/src/bin/e_widget_framelist.c @@ -47,7 +47,7 @@ e_widget_framelist_add(Evas *evas, const char *label, int horiz) evas_object_show(o); edje_object_size_min_calc(wd->o_frame, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); return obj; } @@ -61,7 +61,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj) wd = e_widget_data_get(obj); e_box_pack_end(wd->o_box, sobj); - e_widget_min_size_get(sobj, &mw, &mh); + e_widget_size_min_get(sobj, &mw, &mh); e_box_pack_options_set(sobj, 1, 1, /* fill */ 1, 1, /* expand */ @@ -73,7 +73,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj) edje_extern_object_min_size_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_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, sobj); evas_object_show(sobj); } diff --git a/src/bin/e_widget_frametable.c b/src/bin/e_widget_frametable.c index 9e148b7e2..0b30c9160 100644 --- a/src/bin/e_widget_frametable.c +++ b/src/bin/e_widget_frametable.c @@ -46,7 +46,7 @@ e_widget_frametable_add(Evas *evas, const char *label, int homogenous) evas_object_show(o); edje_object_size_min_calc(wd->o_frame, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); return obj; } @@ -60,7 +60,7 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col, wd = e_widget_data_get(obj); e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan); - e_widget_min_size_get(sobj, &mw, &mh); + e_widget_size_min_get(sobj, &mw, &mh); e_table_pack_options_set(sobj, fill_w, fill_h, /* fill */ expand_w, expand_h, /* expand */ @@ -72,7 +72,7 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col, edje_extern_object_min_size_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_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, sobj); evas_object_show(sobj); } diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index 155df0622..1957bb7f7 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -335,7 +335,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, e_widget_entry_readonly_set(o, 1); wd->o_preview_size_entry = o; e_widget_sub_object_add(obj, o); - e_widget_min_size_set(o, 100, -1); + e_widget_size_min_set(o, 100, -1); e_widget_table_object_append(wd->o_preview_table, wd->o_preview_size_entry, 1, 0, 1, 1, 1, 1, 1, 1); @@ -351,7 +351,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, e_widget_entry_readonly_set(o, 1); wd->o_preview_owner_entry = o; e_widget_sub_object_add(obj, o); - e_widget_min_size_set(o, 100, -1); + e_widget_size_min_set(o, 100, -1); e_widget_table_object_append(wd->o_preview_table, wd->o_preview_owner_entry, 1, 1, 1, 1, 1, 1, 1, 1); @@ -367,7 +367,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, e_widget_entry_readonly_set(o, 1); wd->o_preview_perms_entry = o; e_widget_sub_object_add(obj, o); - e_widget_min_size_set(o, 100, -1); + e_widget_size_min_set(o, 100, -1); e_widget_table_object_append(wd->o_preview_table, wd->o_preview_perms_entry, 1, 2, 1, 1, 1, 1, 1, 1); @@ -383,7 +383,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, e_widget_entry_readonly_set(o, 1); wd->o_preview_time_entry = o; e_widget_sub_object_add(obj, o); - e_widget_min_size_set(o, 100, -1); + e_widget_size_min_set(o, 100, -1); e_widget_table_object_append(wd->o_preview_table, wd->o_preview_time_entry, 1, 3, 1, 1, 1, 1, 1, 1); @@ -428,7 +428,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, wd->o_favorites_frame = o; e_widget_sub_object_add(obj, o); - e_widget_min_size_set(o, 128, 128); + e_widget_size_min_set(o, 128, 128); e_widget_table_object_append(wd->o_table2, o, 0, 1, 1, 1, 1, 1, 0, 1); o = e_fm2_add(evas); @@ -470,7 +470,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, wd->o_files_frame = o; e_widget_sub_object_add(obj, o); - e_widget_min_size_set(o, 128, 128); + e_widget_size_min_set(o, 128, 128); e_widget_table_object_append(wd->o_table2, o, 1, 1, 1, 1, 1, 1, 1, 1); o = e_widget_entry_add(evas, &(wd->entry_text), NULL, NULL, NULL); @@ -495,8 +495,8 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, e_widget_table_object_append(wd->o_table, wd->o_entry, 0, 1, 1, 1, 1, 0, 1, 0); - e_widget_min_size_get(wd->o_table, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_get(wd->o_table, &mw, &mh); + e_widget_size_min_set(obj, mw, mh); evas_object_show(wd->o_favorites_add); evas_object_show(wd->o_up_button); diff --git a/src/bin/e_widget_ilist.c b/src/bin/e_widget_ilist.c index 80405adaa..321015631 100644 --- a/src/bin/e_widget_ilist.c +++ b/src/bin/e_widget_ilist.c @@ -286,7 +286,7 @@ e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, const char **value) evas_object_smart_callback_add(o, "selected", _e_wid_cb_selected, obj); evas_object_resize(obj, 32, 32); - e_widget_min_size_set(obj, 32, 32); + e_widget_size_min_set(obj, 32, 32); return obj; } @@ -457,8 +457,8 @@ e_widget_ilist_go(Evas_Object *obj) { Evas_Coord wmw, wmh; - e_widget_min_size_get(obj, &wmw, &wmh); - e_widget_min_size_set(obj, mw + (w - vw), wmh); + e_widget_size_min_get(obj, &wmw, &wmh); + e_widget_size_min_set(obj, mw + (w - vw), wmh); } else if (mw < vw) evas_object_resize(wd->o_ilist, vw,mh); diff --git a/src/bin/e_widget_image.c b/src/bin/e_widget_image.c index 08db83e1a..5f6c0edde 100644 --- a/src/bin/e_widget_image.c +++ b/src/bin/e_widget_image.c @@ -37,9 +37,9 @@ e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int mi wd->minh = minh <= 0 ? minh : 0; edje_object_size_min_get(object, &mw, &mh); if (minw || minh) - e_widget_min_size_set(obj, minw, minh); + e_widget_size_min_set(obj, minw, minh); else - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); @@ -65,7 +65,7 @@ e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh) evas_object_show(o); e_widget_data_set(obj, wd); e_widget_can_focus_set(obj, 0); - e_widget_min_size_set(obj, minw, minh); + e_widget_size_min_set(obj, minw, minh); e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); @@ -112,9 +112,9 @@ e_widget_image_object_set(Evas_Object *obj, Evas_Object *o) e_icon_object_set(wd->img, o); edje_object_size_min_get(o, &mw, &mh); if (wd->minw || wd->minh) - e_widget_min_size_set(obj, wd->minw, wd->minh); + e_widget_size_min_set(obj, wd->minw, wd->minh); else - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); evas_object_show(wd->img); } diff --git a/src/bin/e_widget_label.c b/src/bin/e_widget_label.c index e1ca18044..60d2486c4 100644 --- a/src/bin/e_widget_label.c +++ b/src/bin/e_widget_label.c @@ -35,7 +35,7 @@ e_widget_label_add(Evas *evas, const char *label) evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); e_widget_can_focus_set(obj, 0); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); diff --git a/src/bin/e_widget_list.c b/src/bin/e_widget_list.c index 5e93f010b..af77dfbcc 100644 --- a/src/bin/e_widget_list.c +++ b/src/bin/e_widget_list.c @@ -47,7 +47,7 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e e_box_pack_end(wd->o_box, sobj); mw = mh = 0; - e_widget_min_size_get(sobj, &mw, &mh); + e_widget_size_min_get(sobj, &mw, &mh); if (e_box_orientation_get(wd->o_box) == 1) e_box_pack_options_set(sobj, 1, fill, /* fill */ @@ -65,7 +65,7 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e 99999, 99999 /* max */ ); e_box_min_size_get(wd->o_box, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, sobj); evas_object_show(sobj); } diff --git a/src/bin/e_widget_preview.c b/src/bin/e_widget_preview.c index d03c1a933..e8d91ec77 100644 --- a/src/bin/e_widget_preview.c +++ b/src/bin/e_widget_preview.c @@ -47,7 +47,7 @@ e_widget_preview_add(Evas *evas, int minw, int minh) e_widget_data_set(obj, wd); e_widget_can_focus_set(obj, 0); edje_object_size_min_calc(wd->o_frame, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, o); return obj; @@ -137,7 +137,7 @@ _e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void *event_info) /* edje_extern_object_max_size_set(wd->img, w, h); */ edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img); edje_object_size_min_calc(wd->o_frame, &w, &h); - e_widget_min_size_set(wd->obj, w, h); + e_widget_size_min_set(wd->obj, w, h); evas_object_resize(wd->obj, w, h); evas_object_smart_callback_call(wd->obj, "preview_update", NULL); } diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c index 33fd34a8a..9c3bfbf8f 100644 --- a/src/bin/e_widget_radio.c +++ b/src/bin/e_widget_radio.c @@ -64,7 +64,7 @@ e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *gro edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); if ((wd->group) && (wd->group->valptr)) { if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e"); @@ -125,7 +125,7 @@ e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int ico } edje_object_size_min_calc(o, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); if ((wd->group) && (wd->group->valptr)) { if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e"); diff --git a/src/bin/e_widget_scrollframe.c b/src/bin/e_widget_scrollframe.c index 375b7a9af..fcdd510f1 100644 --- a/src/bin/e_widget_scrollframe.c +++ b/src/bin/e_widget_scrollframe.c @@ -165,7 +165,7 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_ Evas_Coord mw, mh, vw, vh, w, h; e_scrollframe_child_viewport_size_get(obj, &vw, &vh); - e_widget_min_size_get(data, &mw, &mh); + e_widget_size_min_get(data, &mw, &mh); evas_object_geometry_get(data, NULL, NULL, &w, &h); if (vw >= mw) { diff --git a/src/bin/e_widget_slider.c b/src/bin/e_widget_slider.c index b46c5b148..fbf9f82c9 100644 --- a/src/bin/e_widget_slider.c +++ b/src/bin/e_widget_slider.c @@ -52,9 +52,9 @@ e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min, e_slider_min_size_get(o, &mw, &mh); if (horiz) - e_widget_min_size_set(obj, mw + size, mh); + e_widget_size_min_set(obj, mw + size, mh); else - e_widget_min_size_set(obj, mw, mh + size); + e_widget_size_min_set(obj, mw, mh + size); wd->dval = dval; wd->ival = ival; diff --git a/src/bin/e_widget_spectrum.c b/src/bin/e_widget_spectrum.c index 5968c4711..a56be6bd2 100644 --- a/src/bin/e_widget_spectrum.c +++ b/src/bin/e_widget_spectrum.c @@ -58,7 +58,7 @@ e_widget_spectrum_add(Evas *evas, E_Color_Component mode, E_Color *cv) evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, o); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj); diff --git a/src/bin/e_widget_table.c b/src/bin/e_widget_table.c index 52559d544..a27ede5db 100644 --- a/src/bin/e_widget_table.c +++ b/src/bin/e_widget_table.c @@ -54,7 +54,7 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col, wd = e_widget_data_get(obj); e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan); - e_widget_min_size_get(sobj, &mw, &mh); + e_widget_size_min_get(sobj, &mw, &mh); e_table_pack_options_set(sobj, fill_w, fill_h, /* fill */ expand_w, expand_h, /* expand */ @@ -63,7 +63,7 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col, 99999, 99999 /* max */ ); e_table_min_size_get(wd->o_table, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, sobj); evas_object_show(sobj); } @@ -78,7 +78,7 @@ e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int r e_table_unpack(sobj); e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan); - e_widget_min_size_get(sobj, &mw, &mh); + e_widget_size_min_get(sobj, &mw, &mh); e_table_pack_options_set(sobj, fill_w, fill_h, /* fill */ expand_w, expand_h, /* expand */ @@ -87,7 +87,7 @@ e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int r 99999, 99999 /* max */ ); e_table_min_size_get(wd->o_table, &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); } EAPI void diff --git a/src/bin/e_widget_textblock.c b/src/bin/e_widget_textblock.c index c3d2dbf84..a9223f7bd 100644 --- a/src/bin/e_widget_textblock.c +++ b/src/bin/e_widget_textblock.c @@ -45,7 +45,7 @@ e_widget_textblock_add(Evas *evas) evas_object_show(o); evas_object_resize(obj, 32, 32); - e_widget_min_size_set(obj, 32, 32); + e_widget_size_min_set(obj, 32, 32); return obj; } diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c index 0c222e4ea..150401e9d 100644 --- a/src/bin/e_widget_toolbar.c +++ b/src/bin/e_widget_toolbar.c @@ -84,7 +84,7 @@ e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h) edje_object_size_min_calc (e_scrollframe_edje_object_get(wd->o_base), &mw, &mh); - e_widget_min_size_set(obj, mw, mh); + e_widget_size_min_set(obj, mw, mh); return obj; } @@ -132,9 +132,9 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la evas_object_resize(wd->o_base, 500, 500); e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh); if (wd->scrollable) - e_widget_min_size_set(obj, 500 - vw, mh + (500 - vh)); + e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh)); else - e_widget_min_size_set(obj, mw + (500 - vw), mh + (500 - vh)); + e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh)); } EAPI void @@ -214,9 +214,9 @@ e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable) evas_object_resize(wd->o_base, 500, 500); e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh); if (wd->scrollable) - e_widget_min_size_set(obj, 500 - vw, mh + (500 - vh)); + e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh)); else - e_widget_min_size_set(obj, mw + (500 - vw), mh + (500 - vh)); + e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh)); } EAPI void diff --git a/src/bin/e_widget_toolbook.c b/src/bin/e_widget_toolbook.c index 382b31c67..760726025 100644 --- a/src/bin/e_widget_toolbook.c +++ b/src/bin/e_widget_toolbook.c @@ -54,8 +54,8 @@ e_widget_toolbook_page_append(Evas_Object *toolbook, Evas_Object *icon, const ch ax, ay); evas_object_hide(content); wd->content = eina_list_append(wd->content, content); - e_widget_min_size_get(wd->o_tb, &minw, &minh); - e_widget_min_size_set(toolbook, minw, minh); + e_widget_size_min_get(wd->o_tb, &minw, &minh); + e_widget_size_min_set(toolbook, minw, minh); } EAPI void diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c index ffe91e660..41f075dfc 100644 --- a/src/modules/conf/e_conf.c +++ b/src/modules/conf/e_conf.c @@ -167,20 +167,20 @@ e_configure_show(E_Container *con) e_widget_ilist_selector_set(eco->item_list, 1); e_widget_ilist_go(eco->item_list); e_widget_on_focus_hook_set(eco->item_list, _e_configure_focus_cb, eco->win); - e_widget_min_size_get(eco->item_list, &mw, &mh); + e_widget_size_min_get(eco->item_list, &mw, &mh); if (mw < (200 * e_scale)) mw = 200 * e_scale; if (mh < (120 * e_scale)) mh = 120 * e_scale; - e_widget_min_size_set(eco->item_list, mw, mh); + e_widget_size_min_set(eco->item_list, mw, mh); e_widget_list_object_append(eco->o_list, eco->item_list, 1, 1, 0.5); - e_widget_min_size_get(eco->o_list, &mw, &mh); + e_widget_size_min_get(eco->o_list, &mw, &mh); edje_extern_object_min_size_set(eco->o_list, mw, mh); /* Close Button */ eco->close = e_widget_button_add(eco->evas, _("Close"), NULL, _e_configure_cb_close, eco, NULL); e_widget_on_focus_hook_set(eco->close, _e_configure_focus_cb, eco->win); - e_widget_min_size_get(eco->close, &mw, &mh); + e_widget_size_min_get(eco->close, &mw, &mh); edje_extern_object_min_size_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); @@ -349,8 +349,8 @@ _e_configure_category_cb(void *data, void *data2) _e_configure_item_cb, ci, NULL); } e_widget_ilist_go(eco->item_list); - e_widget_min_size_get(eco->item_list, &w, &h); - e_widget_min_size_set(eco->item_list, w, h); + e_widget_size_min_get(eco->item_list, &w, &h); + e_widget_size_min_set(eco->item_list, w, h); e_widget_ilist_thaw(eco->item_list); edje_thaw(); evas_event_thaw(evas_object_evas_get(eco->item_list)); @@ -503,8 +503,8 @@ _e_configure_fill_cat_list(void *data) } } - e_widget_min_size_get(eco->cat_list, &mw, &mh); - e_widget_min_size_set(eco->cat_list, mw, mh); + e_widget_size_min_get(eco->cat_list, &mw, &mh); + e_widget_size_min_set(eco->cat_list, mw, mh); edje_thaw(); evas_event_thaw(evas_object_evas_get(eco->cat_list)); } diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index 309285b24..09071382f 100644 --- a/src/modules/conf_applications/e_int_config_apps.c +++ b/src/modules/conf_applications/e_int_config_apps.c @@ -380,8 +380,8 @@ _fill_apps(E_Config_Dialog_Data *cfdata) e_widget_ilist_thaw(cfdata->o_all); edje_thaw(); evas_event_thaw(evas); - e_widget_min_size_get(cfdata->o_all, &w, NULL); - e_widget_min_size_set(cfdata->o_all, w, 240); + e_widget_size_min_get(cfdata->o_all, &w, NULL); + e_widget_size_min_set(cfdata->o_all, w, 240); } static void @@ -409,8 +409,8 @@ _fill_list(E_Config_Dialog_Data *cfdata) cfdata->apps = NULL; e_widget_ilist_go(cfdata->o_sel); - e_widget_min_size_get(cfdata->o_sel, &w, NULL); - e_widget_min_size_set(cfdata->o_sel, w, 240); + e_widget_size_min_get(cfdata->o_sel, &w, NULL); + e_widget_size_min_set(cfdata->o_sel, w, 240); e_widget_ilist_thaw(cfdata->o_sel); edje_thaw(); evas_event_thaw(evas); @@ -518,8 +518,8 @@ _cb_add(void *data, void *data2) } e_widget_ilist_go(cfdata->o_sel); - e_widget_min_size_get(cfdata->o_sel, &w, NULL); - e_widget_min_size_set(cfdata->o_sel, w, 240); + e_widget_size_min_get(cfdata->o_sel, &w, NULL); + e_widget_size_min_set(cfdata->o_sel, w, 240); e_widget_ilist_thaw(cfdata->o_sel); e_widget_ilist_unselect(cfdata->o_all); edje_thaw(); @@ -549,8 +549,8 @@ _cb_del(void *data, void *data2) } e_widget_ilist_unselect(cfdata->o_sel); e_widget_ilist_go(cfdata->o_sel); - e_widget_min_size_get(cfdata->o_sel, &w, NULL); - e_widget_min_size_set(cfdata->o_sel, w, 240); + e_widget_size_min_get(cfdata->o_sel, &w, NULL); + e_widget_size_min_set(cfdata->o_sel, w, 240); e_widget_ilist_thaw(cfdata->o_sel); edje_thaw(); evas_event_thaw(evas); @@ -589,8 +589,8 @@ _cb_up(void *data, void *data2) } } e_widget_ilist_go(cfdata->o_sel); - e_widget_min_size_get(cfdata->o_sel, &w, NULL); - e_widget_min_size_set(cfdata->o_sel, w, 240); + e_widget_size_min_get(cfdata->o_sel, &w, NULL); + e_widget_size_min_set(cfdata->o_sel, w, 240); e_widget_ilist_thaw(cfdata->o_sel); edje_thaw(); evas_event_thaw(evas); @@ -629,8 +629,8 @@ _cb_down(void *data, void *data2) } } e_widget_ilist_go(cfdata->o_sel); - e_widget_min_size_get(cfdata->o_sel, &w, NULL); - e_widget_min_size_set(cfdata->o_sel, w, 240); + e_widget_size_min_get(cfdata->o_sel, &w, NULL); + e_widget_size_min_set(cfdata->o_sel, w, 240); e_widget_ilist_thaw(cfdata->o_sel); edje_thaw(); evas_event_thaw(evas); diff --git a/src/modules/conf_borders/e_int_config_borders.c b/src/modules/conf_borders/e_int_config_borders.c index 3bba226c6..bbedb2dc3 100644 --- a/src/modules/conf_borders/e_int_config_borders.c +++ b/src/modules/conf_borders/e_int_config_borders.c @@ -225,8 +225,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf sel = n; } - e_widget_min_size_get(ol, &w, &h); - e_widget_min_size_set(ol, w > 200 ? w : 200, 200); + e_widget_size_min_get(ol, &w, &h); + e_widget_size_min_set(ol, w > 200 ? w : 200, 200); e_widget_ilist_go(ol); e_widget_ilist_selected_set(ol, sel); diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_colors/e_int_config_color_classes.c index 905776560..360dfb696 100644 --- a/src/modules/conf_colors/e_int_config_color_classes.c +++ b/src/modules/conf_colors/e_int_config_color_classes.c @@ -597,8 +597,8 @@ _load_color_classes(Evas_Object *obj, E_Config_Dialog_Data *cfdata) } } e_widget_ilist_go(obj); - e_widget_min_size_get(obj, &w, &h); - e_widget_min_size_set(obj, w, 300); + e_widget_size_min_get(obj, &w, &h); + e_widget_size_min_set(obj, w, 300); e_widget_ilist_thaw(obj); edje_thaw(); evas_event_thaw(evas_object_evas_get(obj)); diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c index d5ed02642..9847b436b 100644 --- a/src/modules/conf_desklock/e_int_config_desklock.c +++ b/src/modules/conf_desklock/e_int_config_desklock.c @@ -345,7 +345,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_fm2_pan_get, e_fm2_pan_max_get, e_fm2_pan_child_size_get); - e_widget_min_size_set(cfdata->o_sf, 100, 100); + e_widget_size_min_set(cfdata->o_sf, 100, 100); e_widget_table_object_append(ft, cfdata->o_sf, 0, 2, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(mt, ft, 0, 0, 1, 3, 1, 1, 1, 1); diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c index 0d8cff033..eb5f64b19 100644 --- a/src/modules/conf_display/e_int_config_display.c +++ b/src/modules/conf_display/e_int_config_display.c @@ -405,7 +405,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("Resolution"), 0); ob = e_widget_ilist_add(evas, 16, 16, NULL); cfdata->res_list = ob; - e_widget_min_size_set(ob, 170, 215); + e_widget_size_min_set(ob, 170, 215); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1); @@ -416,7 +416,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("Refresh"), 0); ob = e_widget_ilist_add(evas, 16, 16, NULL); cfdata->rate_list = ob; - e_widget_min_size_set(ob, 100, 80); + e_widget_size_min_set(ob, 100, 80); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.c b/src/modules/conf_edgebindings/e_int_config_edgebindings.c index 7ac011671..198598452 100644 --- a/src/modules/conf_edgebindings/e_int_config_edgebindings.c +++ b/src/modules/conf_edgebindings/e_int_config_edgebindings.c @@ -232,7 +232,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_frametable_add(evas, _("Edge Bindings"), 0); ob = e_widget_ilist_add(evas, 32, 32, &(cfdata->locals.binding)); cfdata->gui.o_binding_list = ob; - e_widget_min_size_set(ob, 200, 160); + e_widget_size_min_set(ob, 200, 160); e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1); ob = e_widget_button_add(evas, _("Add Edge"), NULL, _add_edge_binding_cb, cfdata, NULL); cfdata->gui.o_add = ob; @@ -257,7 +257,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("Action"), 0); ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->locals.action)); cfdata->gui.o_action_list = ob; - e_widget_min_size_set(ob, 200, 240); + e_widget_size_min_set(ob, 200, 240); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c index fd4d1015b..ade99a0e6 100644 --- a/src/modules/conf_fonts/e_int_config_fonts.c +++ b/src/modules/conf_fonts/e_int_config_fonts.c @@ -444,7 +444,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ob = e_widget_ilist_add(evas, 16, 16, NULL); cfdata->gui.size_list = ob; e_widget_ilist_go(ob); - e_widget_min_size_set(ob, 100, 200); + e_widget_size_min_set(ob, 100, 200); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1); @@ -606,8 +606,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data cfdata->gui.class_list = ob; _class_list_load(cfdata); e_widget_ilist_multi_select_set(ob, 1); - e_widget_min_size_get(ob, &w, NULL); - e_widget_min_size_set(ob, w, 180); + e_widget_size_min_get(ob, &w, NULL); + e_widget_size_min_set(ob, w, 180); e_widget_on_change_hook_set(ob, _adv_class_cb_change, cfdata); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); ob = e_widget_check_add(evas, _("Enable Font Class"), &(cfdata->cur_enabled)); @@ -630,7 +630,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data cfdata->gui.style_list = ob; e_widget_on_change_hook_set(ob, _adv_style_cb_change, cfdata); e_widget_ilist_go(ob); - e_widget_min_size_set(ob, 90, 90); + e_widget_size_min_set(ob, 90, 90); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 1, 1); @@ -638,7 +638,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data ob = e_widget_ilist_add(evas, 16, 16, NULL); cfdata->gui.size_list = ob; e_widget_ilist_go(ob); - e_widget_min_size_set(ob, 90, 90); + e_widget_size_min_set(ob, 90, 90); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 2, 1, 1, 2, 1, 1, 1, 1); @@ -1037,8 +1037,8 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font) } e_widget_ilist_go(ob); - e_widget_min_size_get(ob, &w, NULL); - e_widget_min_size_set(ob, w, 250); + e_widget_size_min_get(ob, &w, NULL); + e_widget_size_min_set(ob, w, 250); e_widget_ilist_thaw(ob); edje_thaw(); evas_event_thaw(evas); diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c index e3f2fc5bf..3bb74bc03 100644 --- a/src/modules/conf_icon_theme/e_int_config_icon_themes.c +++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.c @@ -191,7 +191,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ilist = e_widget_ilist_add(evas, 24, 24, &(cfdata->themename)); cfdata->gui.list = ilist; - e_widget_min_size_set(ilist, 200, 240); + e_widget_size_min_set(ilist, 200, 240); e_widget_framelist_object_append(of, ilist); diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c index 6bd4bd974..7ed527a90 100644 --- a/src/modules/conf_imc/e_int_config_imc.c +++ b/src/modules/conf_imc/e_int_config_imc.c @@ -309,7 +309,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf /* Input method List */ ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->imc_current)); e_widget_on_change_hook_set(ob, _e_imc_list_change_cb, cfdata); - e_widget_min_size_set(ob, 175, 175); + e_widget_size_min_set(ob, 175, 175); cfdata->gui.imc_basic_list = ob; evas_event_freeze(evas_object_evas_get(ob)); @@ -881,7 +881,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data e_fm2_pan_max_get, e_fm2_pan_child_size_get); cfdata->o_frame = of; - e_widget_min_size_set(of, 160, 160); + e_widget_size_min_set(of, 160, 160); e_widget_table_object_append(ol, of, 0, 2, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 1, 1, 1); diff --git a/src/modules/conf_imc/e_int_config_imc_import.c b/src/modules/conf_imc/e_int_config_imc_import.c index 7bd2888e6..4d0b5c326 100644 --- a/src/modules/conf_imc/e_int_config_imc_import.c +++ b/src/modules/conf_imc/e_int_config_imc_import.c @@ -104,7 +104,7 @@ e_int_config_imc_import(E_Config_Dialog *parent) import->fsel_obj = ofm; e_widget_list_object_append(o, ofm, 1, 1, 0.5); - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.content", o); evas_object_show(o); @@ -123,7 +123,7 @@ e_int_config_imc_import(E_Config_Dialog *parent) e_win_centered_set(win, 1); o = import->box_obj; - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o); diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c index f0909a05a..826bf19e9 100644 --- a/src/modules/conf_intl/e_int_config_intl.c +++ b/src/modules/conf_intl/e_int_config_intl.c @@ -899,7 +899,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf o = e_widget_table_add(evas, 0); of = e_widget_framelist_add(evas, _("Language Selector"), 0); ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_blang)); - e_widget_min_size_set(ob, 175, 175); + e_widget_size_min_set(ob, 175, 175); e_widget_on_change_hook_set(ob, _ilist_basic_language_cb_change, cfdata); cfdata->gui.blang_list = ob; e_widget_framelist_object_append(of, ob); @@ -953,7 +953,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ob = e_widget_entry_add(evas, &(cfdata->cur_language), NULL, NULL, NULL); cfdata->gui.locale_entry = ob; e_widget_disabled_set(cfdata->gui.locale_entry, 1); - e_widget_min_size_set(cfdata->gui.locale_entry, 100, 25); + e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25); e_widget_frametable_object_append(of, cfdata->gui.locale_entry, 0, 1, 1, 1, 1, 1, 1, 0); e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0); @@ -993,7 +993,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data } e_widget_ilist_go(ob); - e_widget_min_size_set(ob, 140, 200); + e_widget_size_min_set(ob, 140, 200); e_widget_framelist_object_append(of, ob); e_widget_ilist_selected_set(ob, e_widget_ilist_selected_get(ob)); @@ -1002,7 +1002,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data cfdata->gui.reg_list = ob; e_widget_ilist_go(ob); - e_widget_min_size_set(ob, 100, 100); + e_widget_size_min_set(ob, 100, 100); e_widget_framelist_object_append(of, ob); e_widget_ilist_selected_set(ob, e_widget_ilist_selected_get(ob)); @@ -1011,7 +1011,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data cfdata->gui.cs_list = ob; e_widget_ilist_go(ob); - e_widget_min_size_set(ob, 100, 100); + e_widget_size_min_set(ob, 100, 100); e_widget_framelist_object_append(of, ob); /* Modified List */ @@ -1019,7 +1019,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data cfdata->gui.mod_list = ob; e_widget_ilist_go(ob); - e_widget_min_size_set(ob, 100, 100); + e_widget_size_min_set(ob, 100, 100); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1); @@ -1031,7 +1031,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data ob = e_widget_entry_add(evas, &(cfdata->cur_language), NULL, NULL, NULL); cfdata->gui.locale_entry = ob; e_widget_disabled_set(cfdata->gui.locale_entry, 1); - e_widget_min_size_set(cfdata->gui.locale_entry, 100, 25); + e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25); e_widget_frametable_object_append(of, cfdata->gui.locale_entry, 0, 1, 1, 1, 1, 1, 1, 0); e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0); diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c index 9bbe21d63..4ebf0374f 100644 --- a/src/modules/conf_keybindings/e_int_config_keybindings.c +++ b/src/modules/conf_keybindings/e_int_config_keybindings.c @@ -223,7 +223,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_frametable_add(evas, _("Key Bindings"), 0); ob = e_widget_ilist_add(evas, 32, 32, &(cfdata->locals.binding)); cfdata->gui.o_binding_list = ob; - e_widget_min_size_set(ob, 200, 200); + e_widget_size_min_set(ob, 200, 200); e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1); ob = e_widget_button_add(evas, _("Add Key"), NULL, _add_key_binding_cb, cfdata, NULL); cfdata->gui.o_add = ob; @@ -248,7 +248,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("Action"), 0); ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->locals.action)); cfdata->gui.o_action_list = ob; - e_widget_min_size_set(ob, 200, 280); + e_widget_size_min_set(ob, 200, 280); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); diff --git a/src/modules/conf_mime/e_int_config_mime.c b/src/modules/conf_mime/e_int_config_mime.c index b29ddca8c..6057dc730 100644 --- a/src/modules/conf_mime/e_int_config_mime.c +++ b/src/modules/conf_mime/e_int_config_mime.c @@ -187,7 +187,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) ol = e_widget_ilist_add(evas, 16, 16, NULL); cfdata->gui.list = ol; e_widget_ilist_go(ol); - e_widget_min_size_set(cfdata->gui.list, 250, 200); + e_widget_size_min_set(cfdata->gui.list, 250, 200); e_widget_frametable_object_append(of, ol, 0, 0, 3, 1, 1, 1, 1, 1); ob = e_widget_button_add(evas, _("Set"), "configure", _cb_config, cfdata, NULL); @@ -255,8 +255,8 @@ _fill_list(E_Config_Dialog_Data *cfdata, const char *mtype) e_widget_ilist_append(cfdata->gui.list, icon, m->mime, NULL, NULL, NULL); } e_widget_ilist_go(cfdata->gui.list); - e_widget_min_size_get(cfdata->gui.list, &w, &h); - e_widget_min_size_set(cfdata->gui.list, w, 200); + e_widget_size_min_get(cfdata->gui.list, &w, &h); + e_widget_size_min_set(cfdata->gui.list, w, 200); e_widget_ilist_thaw(cfdata->gui.list); edje_thaw(); evas_event_thaw(evas); @@ -290,8 +290,8 @@ _fill_tlist(E_Config_Dialog_Data *cfdata) } e_widget_ilist_go(cfdata->gui.tlist); - e_widget_min_size_get(cfdata->gui.tlist, &w, &h); - e_widget_min_size_set(cfdata->gui.tlist, w, 225); + e_widget_size_min_get(cfdata->gui.tlist, &w, &h); + e_widget_size_min_set(cfdata->gui.tlist, w, 225); e_widget_ilist_thaw(cfdata->gui.tlist); edje_thaw(); evas_event_thaw(evas_object_evas_get(cfdata->gui.tlist)); diff --git a/src/modules/conf_mime/e_int_config_mime_edit.c b/src/modules/conf_mime/e_int_config_mime_edit.c index c4866b88e..d6e73c5b2 100644 --- a/src/modules/conf_mime/e_int_config_mime_edit.c +++ b/src/modules/conf_mime/e_int_config_mime_edit.c @@ -138,7 +138,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL); e_widget_entry_readonly_set(ob, 1); - e_widget_min_size_set(ob, 100, 1); + e_widget_size_min_set(ob, 100, 1); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -168,7 +168,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) if (icon) e_widget_button_icon_set(oi, icon); } - e_widget_min_size_set(oi, 48, 48); + e_widget_size_min_set(oi, 48, 48); e_widget_frametable_object_append(of, oi, 1, 5, 1, 1, 1, 1, 1, 1); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -277,7 +277,7 @@ _cb_icon_sel(void *data, void *data2) cfdata->gui.fsel_wid = o; evas_object_show(o); - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); e_dialog_content_set(dia, o, w, h); e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata); diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c index ed9fd7da8..e95050dc0 100644 --- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c +++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c @@ -275,7 +275,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ot = e_widget_frametable_add(evas, _("Mouse Bindings"), 0); ob = e_widget_ilist_add(evas, 32, 32, &(cfdata->locals.binding)); cfdata->gui.o_binding_list = ob; - e_widget_min_size_set(ob, 200, 200); + e_widget_size_min_set(ob, 200, 200); e_widget_frametable_object_append(ot, ob, 0, 0, 2, 1, 1, 1, 1, 1); ob = e_widget_button_add(evas, _("Add Binding"), NULL, _add_mouse_binding_cb, cfdata, NULL); @@ -301,7 +301,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("Action"), 0); ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->locals.action)); cfdata->gui.o_action_list = ob; - e_widget_min_size_set(ob, 200, 200); + e_widget_size_min_set(ob, 200, 200); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 0, 0, 3, 1, 1, 1, 1, 1); diff --git a/src/modules/conf_paths/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c index 14ee06308..d40858fac 100644 --- a/src/modules/conf_paths/e_int_config_paths.c +++ b/src/modules/conf_paths/e_int_config_paths.c @@ -168,7 +168,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("E Paths"), 0); ob = e_widget_ilist_add(evas, 0, 0, NULL); cfdata->gui.path_list = ob; - e_widget_min_size_set(ob, 170, 100); + e_widget_size_min_set(ob, 170, 100); evas_event_freeze(evas_object_evas_get(cfdata->gui.path_list)); edje_freeze(); @@ -199,7 +199,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("Default Directories"), 0); ob = e_widget_ilist_add(evas, 0, 0, NULL); cfdata->gui.default_list = ob; - e_widget_min_size_set(ob, 100, 100); + e_widget_size_min_set(ob, 100, 100); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1); diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c index b4a27fac9..54f3af434 100644 --- a/src/modules/conf_profiles/e_int_config_profiles.c +++ b/src/modules/conf_profiles/e_int_config_profiles.c @@ -106,13 +106,13 @@ _create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) of = e_widget_framelist_add(evas, _("Available Profiles"), 0); cfdata->o_list = e_widget_ilist_add(evas, 24, 24, &(cfdata->sel_profile)); - e_widget_min_size_set(cfdata->o_list, 140 * e_scale, 50 * e_scale); + e_widget_size_min_set(cfdata->o_list, 140 * e_scale, 50 * e_scale); e_widget_framelist_object_append(of, cfdata->o_list); e_widget_list_object_append(o, of, 1, 1, 0.5); ob = e_widget_textblock_add(evas); - e_widget_min_size_set(ob, 140 * e_scale, 50 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 50 * e_scale); e_widget_textblock_markup_set(ob, _("Select a profile")); e_widget_list_object_append(o, ob, 1, 0, 0.5); cfdata->o_text = ob; @@ -206,7 +206,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata) if (profiles) eina_list_free(profiles); if (selected >= 0) e_widget_ilist_selected_set(cfdata->o_list, selected); - e_widget_min_size_set(cfdata->o_list, 155, 250); + e_widget_size_min_set(cfdata->o_list, 155, 250); e_widget_ilist_go(cfdata->o_list); e_widget_ilist_thaw(cfdata->o_list); @@ -355,11 +355,11 @@ _dia_new_profile(E_Config_Dialog_Data *cfdata) 0, 0, 1, 1, 0, 1, 0, 0); ob = e_widget_entry_add(evas, &(cfdata->new_profile), NULL, NULL, NULL); - e_widget_min_size_set(ob, 100, 1); + e_widget_size_min_set(ob, 100, 1); e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 1, 1, 0); - e_widget_min_size_get(ot, &mw, &mh); + e_widget_size_min_get(ot, &mw, &mh); e_dialog_content_set(dia, ot, mw, mh); e_dialog_button_add(dia, _("OK"), NULL, _new_profile_cb_ok, cfdata); diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index 8c12efa58..0e6a75fcc 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -71,7 +71,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) of = e_widget_framelist_add(evas, _("Configured Shelves"), 0); cfdata->o_list = e_widget_ilist_add(evas, 24, 24, &(cfdata->cur_shelf)); e_widget_ilist_selector_set(cfdata->o_list, 1); - e_widget_min_size_set(cfdata->o_list, 155, 250); + e_widget_size_min_set(cfdata->o_list, 155, 250); e_widget_framelist_object_append(of, cfdata->o_list); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -179,7 +179,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata) _ilist_cb_selected, cfdata, buf); } - e_widget_min_size_set(cfdata->o_list, 155, 250); + e_widget_size_min_set(cfdata->o_list, 155, 250); e_widget_ilist_go(cfdata->o_list); e_widget_ilist_thaw(cfdata->o_list); edje_thaw(); diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c index 34aa377ad..c7141ef15 100644 --- a/src/modules/conf_startup/e_int_config_startup.c +++ b/src/modules/conf_startup/e_int_config_startup.c @@ -319,7 +319,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_fm2_pan_max_get, e_fm2_pan_child_size_get); cfdata->o_frame = of; - e_widget_min_size_set(of, 160, 160); + e_widget_size_min_set(of, 160, 160); e_widget_table_object_append(ol, of, 0, 2, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 1, 1, 1); diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index d759eb44d..db1e88076 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -421,7 +421,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf _cb_files_files_deleted, cfdata); e_widget_flist_path_set(o, path, "/"); - e_widget_min_size_set(o, 160, 160); + e_widget_size_min_set(o, 160, 160); e_widget_table_object_append(ol, o, 0, 2, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 1, 1, 1); @@ -1000,7 +1000,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data e_widget_on_change_hook_set(ob, _cb_adv_categories_change, cfdata); cfdata->o_categories_ilist = ob; e_widget_ilist_multi_select_set(ob, 0); - e_widget_min_size_set(ob, 150, 250); + e_widget_size_min_set(ob, 150, 250); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 0, 1); @@ -1008,7 +1008,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data ob = e_widget_ilist_add(evas, 16, 16, NULL); e_widget_on_change_hook_set(ob, _cb_adv_theme_change, cfdata); cfdata->o_files_ilist = ob; - e_widget_min_size_set(ob, 150, 250); + e_widget_size_min_set(ob, 150, 250); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1); 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 4d4846bf7..104820b10 100644 --- a/src/modules/conf_theme/e_int_config_theme_import.c +++ b/src/modules/conf_theme/e_int_config_theme_import.c @@ -105,7 +105,7 @@ e_int_config_theme_import(E_Config_Dialog *parent) import->fsel_obj = ofm; e_widget_list_object_append(o, ofm, 1, 1, 0.5); - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.content", o); evas_object_show(o); @@ -124,7 +124,7 @@ e_int_config_theme_import(E_Config_Dialog *parent) e_win_centered_set(win, 1); o = import->box_obj; - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o); diff --git a/src/modules/conf_transitions/e_int_config_transitions.c b/src/modules/conf_transitions/e_int_config_transitions.c index d0cfa24bd..c99461305 100644 --- a/src/modules/conf_transitions/e_int_config_transitions.c +++ b/src/modules/conf_transitions/e_int_config_transitions.c @@ -126,7 +126,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("Events"), 0); il = e_widget_ilist_add(evas, 48, 48, NULL); cfdata->event_list = il; - e_widget_min_size_set(il, 140, 200); + e_widget_size_min_set(il, 140, 200); evas_event_freeze(evas_object_evas_get(il)); edje_freeze(); @@ -144,7 +144,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_framelist_add(evas, _("Transitions"), 0); il = e_widget_ilist_add(evas, 48, 48, NULL); cfdata->trans_list = il; - e_widget_min_size_set(il, 100, 200); + e_widget_size_min_set(il, 100, 200); evas_event_freeze(evas_object_evas_get(il)); edje_freeze(); diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c index 267912d65..82c069519 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c @@ -538,7 +538,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _cb_files_files_deleted, cfdata); e_widget_flist_path_set(ow, path, "/"); - e_widget_min_size_set(ow, 160, 160); + e_widget_size_min_set(ow, 160, 160); e_widget_table_object_append(ot, ow, 0, 2, 1, 1, 1, 1, 1, 1); e_widget_list_object_append(o, ot, 1, 1, 0.0); @@ -666,7 +666,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _cb_files_files_changed, cfdata); e_widget_flist_path_set(ow, path, "/"); - e_widget_min_size_set(ow, 160, 160); + e_widget_size_min_set(ow, 160, 160); e_widget_table_object_append(ot, ow, 0, 2, 1, 1, 1, 1, 1, 1); e_widget_list_object_append(o, ot, 1, 1, 0.0); diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c index 8d3f59e16..4c07623eb 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c @@ -155,7 +155,7 @@ e_int_config_wallpaper_gradient(E_Config_Dialog *parent) o = _preview_widget_add(evas); evas_object_show(o); evas_object_resize(o, 200, 150); - e_widget_min_size_set(o, 200, 150); + e_widget_size_min_set(o, 200, 150); e_widget_framelist_object_append(of, o); e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1); import->preview = o; @@ -192,7 +192,7 @@ e_int_config_wallpaper_gradient(E_Config_Dialog *parent) e_widget_table_object_append(ot, of, 0, 2, 2, 1, 1, 1, 1, 1); e_widget_list_object_append(ol, ot, 1, 1, 0.5); - e_widget_min_size_get(ol, &mw, &mh); + e_widget_size_min_get(ol, &mw, &mh); e_dialog_content_set(dia, ol, mw, mh); e_dialog_button_add(dia, _("OK"), NULL, _import_cb_ok, cfdata); diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c index b2928d493..3eab5da91 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c @@ -204,7 +204,7 @@ e_int_config_wallpaper_import(void *data, const char *path) e_widget_list_object_append(o, ot, 0, 0, 0.5); - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.content", o); evas_object_show(o); @@ -220,7 +220,7 @@ e_int_config_wallpaper_import(void *data, const char *path) e_win_centered_set(win, 1); o = import->box_obj; - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o); @@ -318,7 +318,7 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent) fsel->fsel_obj = ofm; e_widget_list_object_append(o, ofm, 1, 1, 0.5); - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(fsel->bg_obj, "e.swallow.content", o); evas_object_show(o); @@ -335,7 +335,7 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent) e_win_centered_set(win, 1); o = fsel->box_obj; - e_widget_min_size_get(o, &w, &h); + e_widget_size_min_get(o, &w, &h); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(fsel->bg_obj, "e.swallow.buttons", o); diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c index b6b98dc74..7db1cad3d 100644 --- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c @@ -1170,7 +1170,7 @@ wp_browser_new(E_Container *con) evas_object_show(info->button); e_widget_list_object_append(info->box, info->button, 1, 0, 0.5); - e_widget_min_size_get(info->box, &mw, &mh); + e_widget_size_min_get(info->box, &mw, &mh); edje_extern_object_min_size_set(info->box, mw, mh); edje_object_part_swallow(info->bg, "e.swallow.buttons", info->box); evas_object_show(info->box); @@ -1247,7 +1247,7 @@ wp_browser_new(E_Container *con) e_widget_list_object_append(ob, o, 1, 0, 0.5); evas_object_show(o); - e_widget_min_size_get(ob, &mw, &mh); + e_widget_size_min_get(ob, &mw, &mh); edje_extern_object_min_size_set(ob, mw, mh); edje_object_part_swallow(info->bg, "e.swallow.extras", ob); evas_object_show(ob); diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c index 8cdb450f5..3cfad8203 100644 --- a/src/modules/conf_window_remembers/e_int_config_remembers.c +++ b/src/modules/conf_window_remembers/e_int_config_remembers.c @@ -210,12 +210,12 @@ _fill_remembers(E_Config_Dialog_Data *cfdata) } e_widget_ilist_go(cfdata->list); - e_widget_min_size_get(cfdata->list, &w, NULL); + e_widget_size_min_get(cfdata->list, &w, NULL); /* NB: make the window look a bit better by not being so small */ // if (w < 300) w = 300; - e_widget_min_size_set(cfdata->list, 400, 200); + e_widget_size_min_set(cfdata->list, 400, 200); e_widget_ilist_thaw(cfdata->list); edje_thaw(); evas_event_thaw(evas); diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c index 7a591b356..1b73d79a2 100644 --- a/src/modules/connman/e_mod_main.c +++ b/src/modules/connman/e_mod_main.c @@ -448,9 +448,9 @@ net_dialog_show(Instance *inst, Conf_Network *cfnet) o = e_widget_label_add(evas, "Personal Name"); e_widget_table_object_append(table, o, 0, row, 1, 1, 1, 1, 0, 0); o = e_widget_entry_add(evas, &(cfnet->name), NULL, NULL, NULL); - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); mw = 160; - e_widget_min_size_set(o, mw, mh); + e_widget_size_min_set(o, mw, mh); e_widget_table_object_append(table, o, 1, row, 1, 1, 1, 1, 0, 0); row++; @@ -470,9 +470,9 @@ net_dialog_show(Instance *inst, Conf_Network *cfnet) o = e_widget_label_add(evas, "Password"); e_widget_table_object_append(table, o, 0, row, 1, 1, 1, 1, 0, 0); o = e_widget_entry_add(evas, &(cfnet->password), NULL, NULL, NULL); - e_widget_min_size_get(o, &mw, &mh); + e_widget_size_min_get(o, &mw, &mh); mw = 160; - e_widget_min_size_set(o, mw, mh); + e_widget_size_min_set(o, mw, mh); e_widget_table_object_append(table, o, 1, row, 1, 1, 1, 1, 0, 0); row++; @@ -487,7 +487,7 @@ net_dialog_show(Instance *inst, Conf_Network *cfnet) e_widget_table_object_append(table, button, 0, row, 2, 1, 0, 0, 0, 0); row++; - e_widget_min_size_get(table, &mw, &mh); + e_widget_size_min_get(table, &mw, &mh); e_dialog_content_set(dialog, table, mw, mh); e_win_delete_callback_set(dialog->win, net_dialog_cb_del); @@ -760,7 +760,7 @@ if_dialog_show(Instance *inst) e_widget_ilist_go(ilist); e_widget_ilist_thaw(ilist); - e_widget_min_size_set(ilist, 240, 180); + e_widget_size_min_set(ilist, 240, 180); e_widget_framelist_object_append(flist, ilist); e_widget_list_object_append(list, flist, 1, 0, 0.5); @@ -770,7 +770,7 @@ if_dialog_show(Instance *inst) inst, NULL); e_widget_list_object_append(list, button, 1, 0, 0.5); - e_widget_min_size_get(list, &mw, &mh); + e_widget_size_min_get(list, &mw, &mh); e_dialog_content_set(dialog, list, mw, mh); e_win_delete_callback_set(dialog->win, if_dialog_cb_del); @@ -1070,7 +1070,7 @@ popup_show(Instance *inst) e_widget_ilist_go(ilist); e_widget_ilist_thaw(ilist); - e_widget_min_size_set(ilist, 240, 320); + e_widget_size_min_set(ilist, 240, 320); e_widget_table_object_append(base, ilist, 0, 0, 1, 1, 1, 1, 1, 1); @@ -1079,10 +1079,10 @@ popup_show(Instance *inst) e_widget_table_object_append(base, button, 0, 1, 1, 1, 0, 0, 0, 0); - e_widget_min_size_get(base, &mw, &mh); + e_widget_size_min_get(base, &mw, &mh); if (mh < 188) mh = 188; if (mw < 168) mw = 168; - e_widget_min_size_set(base, mw, mh); + e_widget_size_min_set(base, mw, mh); edje_thaw(); diff --git a/src/modules/everything/evry_config.c b/src/modules/everything/evry_config.c index 374ecf646..c0e268d06 100644 --- a/src/modules/everything/evry_config.c +++ b/src/modules/everything/evry_config.c @@ -148,8 +148,8 @@ _fill_list(Eina_List *plugins, Evas_Object *obj, int enabled __UNUSED__) e_widget_ilist_append(obj, NULL, p->name, NULL, p, NULL); e_widget_ilist_go(obj); - e_widget_min_size_get(obj, &w, NULL); - e_widget_min_size_set(obj, w > 180 ? w : 180, 200); + e_widget_size_min_get(obj, &w, NULL); + e_widget_size_min_set(obj, w > 180 ? w : 180, 200); e_widget_ilist_thaw(obj); edje_thaw(); evas_event_thaw(evas); diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 1a143b339..292d555cb 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -1139,7 +1139,7 @@ _e_fwin_cb_resize(E_Win *win) { int height; - e_widget_min_size_get(fwin->tb_obj, NULL, &height); + e_widget_size_min_get(fwin->tb_obj, NULL, &height); evas_object_resize(fwin->tb_obj, fwin->win->w, height); } EINA_LIST_FOREACH(fwin->pages, l, page) @@ -1938,7 +1938,7 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always) e_widget_ilist_thaw(o); edje_thaw(); evas_event_thaw(evas); - e_widget_min_size_set(o, 160, 240); + e_widget_size_min_set(o, 160, 240); e_widget_framelist_object_append(of, o); e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); @@ -1948,7 +1948,7 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always) _e_fwin_cb_exec_cmd_changed, fad, NULL); e_widget_table_object_append(ot, fad->o_entry, 0, 2, 1, 1, 1, 1, 1, 0); - e_widget_min_size_get(ot, &mw, &mh); + e_widget_size_min_get(ot, &mw, &mh); e_dialog_content_set(dia, ot, mw, mh); evas_object_event_callback_add(ot, EVAS_CALLBACK_KEY_DOWN, _e_fwin_file_open_dialog_cb_key_down, page); e_dialog_show(dia); diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c index 58f4a1a6d..04e7a9da0 100644 --- a/src/modules/gadman/e_mod_config.c +++ b/src/modules/gadman/e_mod_config.c @@ -232,7 +232,7 @@ _adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfda e_fm2_pan_get, e_fm2_pan_max_get, e_fm2_pan_child_size_get); - e_widget_min_size_set(cfdata->o_sf, 200, 250); + e_widget_size_min_set(cfdata->o_sf, 200, 250); e_widget_frametable_object_append(of, cfdata->o_sf, 0, 2, 2, 1, 1, 1, 1, 1); e_widget_table_object_append(ft, of, 1, 0, 1, 3, 1, 1, 1, 1); @@ -306,9 +306,9 @@ _fill_gadgets_list(Evas_Object *ilist) } e_widget_ilist_go(ilist); - e_widget_min_size_get(ilist, &w, NULL); + e_widget_size_min_get(ilist, &w, NULL); if (w < 200) w = 200; - e_widget_min_size_set(ilist, w, 250); + e_widget_size_min_set(ilist, w, 250); e_widget_ilist_thaw(ilist); } diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c index c4eb11350..df56b8202 100644 --- a/src/modules/ibar/e_mod_config.c +++ b/src/modules/ibar/e_mod_config.c @@ -103,7 +103,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ol = e_widget_ilist_add(evas, 32, 32, &(cfdata->dir)); cfdata->tlist = ol; _load_tlist(cfdata); - e_widget_min_size_set(ol, 140, 140); + e_widget_size_min_set(ol, 140, 140); e_widget_frametable_object_append(of, ol, 0, 0, 1, 2, 1, 1, 1, 0); ot = e_widget_table_add(evas, 0); diff --git a/src/modules/illume/e_cfg.c b/src/modules/illume/e_cfg.c index 3b52918cd..56c3f620c 100644 --- a/src/modules/illume/e_cfg.c +++ b/src/modules/illume/e_cfg.c @@ -1204,7 +1204,7 @@ _e_cfg_win_complete(Evas_Object *ol) win = evas_object_data_get(ol, "win"); d = win->data; - e_widget_min_size_get(ol, &mw, &mh); + e_widget_size_min_get(ol, &mw, &mh); evas_object_resize(ol, mw, mh); sf = e_widget_scrollframe_simple_add(evas_object_evas_get(ol), ol); diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c index e87211bc5..e2674128a 100644 --- a/src/modules/mixer/app_mixer.c +++ b/src/modules/mixer/app_mixer.c @@ -346,7 +346,7 @@ _create_cards(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app) ui = &app->ui.cards; ui->list = e_widget_ilist_add(evas, 32, 32, &app->card); - e_widget_min_size_set(ui->list, 180, 100); + e_widget_size_min_set(ui->list, 180, 100); e_widget_ilist_go(ui->list); EINA_LIST_FOREACH(app->cards, l, card) { @@ -372,7 +372,7 @@ _create_channels(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app) ui = &app->ui.channels; ui->list = e_widget_ilist_add(evas, 24, 24, &app->channel_name); - e_widget_min_size_set(ui->list, 180, 100); + e_widget_size_min_set(ui->list, 180, 100); e_widget_ilist_go(ui->list); ui->frame = e_widget_framelist_add(evas, _("Channels"), 0); @@ -455,7 +455,7 @@ _create_ui(E_Dialog *dialog, E_Mixer_App_Dialog_Data *app) select_card(app); e_widget_ilist_selected_set(ui->channels.list, 1); - e_widget_min_size_get(ui->hlayout, &mw, &mh); + e_widget_size_min_get(ui->hlayout, &mw, &mh); if (mw < 300) mw = 300; if (mh < 200) diff --git a/src/modules/mixer/conf_gadget.c b/src/modules/mixer/conf_gadget.c index 9c93b00ea..9354d11c7 100644 --- a/src/modules/mixer/conf_gadget.c +++ b/src/modules/mixer/conf_gadget.c @@ -238,7 +238,7 @@ _fill_channels(Evas *evas, E_Config_Dialog_Data *cfdata) ++i; } - e_widget_min_size_get(ui->list, &mw, &mh); + e_widget_size_min_get(ui->list, &mw, &mh); evas_object_resize(ui->list, mw, mh); selected = eina_list_nth(ui->radios, cfdata->channel); @@ -264,9 +264,9 @@ _channel_scroll_set_min_size(struct mixer_config_ui_channels *ui) if (len < 1) return; - e_widget_min_size_get(ui->list, &w, &h); + e_widget_size_min_get(ui->list, &w, &h); h = 4 * h / len; - e_widget_min_size_set(ui->scroll, w, h); + e_widget_size_min_set(ui->scroll, w, h); } static void diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index 3183eb220..efe514e1a 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -604,10 +604,10 @@ _mixer_popup_new(E_Mixer_Instance *inst) e_widget_table_object_append(inst->ui.table, inst->ui.button, 0, 7, colspan, 1, 1, 1, 1, 0); - e_widget_min_size_get(inst->ui.table, &mw, &mh); + e_widget_size_min_get(inst->ui.table, &mw, &mh); if (mh < 208) mh = 208; if (mw < 68) mw = 68; - e_widget_min_size_set(inst->ui.table, mw, mh); + e_widget_size_min_set(inst->ui.table, mw, mh); e_gadcon_popup_content_set(inst->popup, inst->ui.table); e_gadcon_popup_show(inst->popup); diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c index a08f52d6b..ca2d6a919 100644 --- a/src/modules/wizard/e_wizard.c +++ b/src/modules/wizard/e_wizard.c @@ -157,7 +157,7 @@ e_wizard_page_show(Evas_Object *obj) o_content = obj; if (obj) { - e_widget_min_size_get(obj, &minw, &minh); + e_widget_size_min_get(obj, &minw, &minh); edje_extern_object_min_size_set(obj, minw, minh); edje_object_part_swallow(o_bg, "e.swallow.content", obj); evas_object_show(obj); diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index 114c9386c..94a1321f7 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -140,7 +140,7 @@ wizard_page_show(E_Wizard_Page *pg) e_wizard_title_set(_("Language")); of = e_widget_framelist_add(pg->evas, _("Select one"), 0); ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &lang); - e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale); e_widget_ilist_freeze(ob); diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c index fb159025b..cbc04529c 100644 --- a/src/modules/wizard/page_020.c +++ b/src/modules/wizard/page_020.c @@ -56,7 +56,7 @@ wizard_page_show(E_Wizard_Page *pg) of = e_widget_framelist_add(pg->evas, _("Select one"), 0); ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &profile); - e_widget_min_size_set(ob, 140 * e_scale, 70 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 70 * e_scale); ilist = ob; e_widget_on_change_hook_set(ob, _profile_change, NULL); @@ -114,7 +114,7 @@ wizard_page_show(E_Wizard_Page *pg) e_widget_framelist_object_append(of, ob); ob = e_widget_textblock_add(pg->evas); - e_widget_min_size_set(ob, 140 * e_scale, 70 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 70 * e_scale); e_widget_textblock_markup_set(ob, _("Select a profile")); textblock = ob; diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c index a08aa5024..f7e5f3055 100644 --- a/src/modules/wizard/page_030.c +++ b/src/modules/wizard/page_030.c @@ -83,7 +83,7 @@ wizard_page_show(E_Wizard_Page *pg) of = e_widget_framelist_add(pg->evas, _("Error"), 0); ob = e_widget_textblock_add(pg->evas); - e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale); e_widget_textblock_markup_set (ob, _("No menu files were
" @@ -107,7 +107,7 @@ wizard_page_show(E_Wizard_Page *pg) of = e_widget_framelist_add(pg->evas, _("Select application menu"), 0); ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &xdg_sel); - e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale); e_widget_ilist_freeze(ob); diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c index e3ca46d07..69bd3fc6e 100644 --- a/src/modules/wizard/page_040.c +++ b/src/modules/wizard/page_040.c @@ -27,7 +27,7 @@ wizard_page_show(E_Wizard_Page *pg) of = e_widget_framelist_add(pg->evas, _("Select applications"), 0); ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, NULL); - e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale); e_widget_ilist_freeze(ob); e_widget_ilist_go(ob); diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c index dda79b3be..0fdc057f0 100644 --- a/src/modules/wizard/page_070.c +++ b/src/modules/wizard/page_070.c @@ -201,7 +201,7 @@ wizard_page_show(E_Wizard_Page *pg) li = e_widget_list_add(pg->evas, 1, 0); ob = e_widget_scrollframe_simple_add(pg->evas, li); - e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale); for (i = 0; i < (sizeof(apps) / sizeof(App)); i++) { @@ -221,7 +221,7 @@ wizard_page_show(E_Wizard_Page *pg) } } - e_widget_min_size_get(li, &mw, &mh); + e_widget_size_min_get(li, &mw, &mh); evas_object_resize(li, mw, mh); e_widget_framelist_object_append(of, ob); diff --git a/src/modules/wizard/page_080.c b/src/modules/wizard/page_080.c index b0ddc725b..b6d5869d1 100644 --- a/src/modules/wizard/page_080.c +++ b/src/modules/wizard/page_080.c @@ -65,7 +65,7 @@ wizard_page_show(E_Wizard_Page *pg) li = e_widget_list_add(pg->evas, 1, 0); ob = e_widget_scrollframe_simple_add(pg->evas, li); - e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale); for (i = 0, l = desktops; l ; l = l->next, i++) { @@ -85,7 +85,7 @@ wizard_page_show(E_Wizard_Page *pg) evas_object_show(ck); } - e_widget_min_size_get(li, &mw, &mh); + e_widget_size_min_get(li, &mw, &mh); evas_object_resize(li, mw, mh); e_widget_framelist_object_append(of, ob);