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

More API Inconsistency fixes: 

e_box_min_size_* to e_box_size_min_*
e_box_max_size_* to e_box_size_max_*



SVN revision: 42161
This commit is contained in:
Christopher Michael 2009-09-01 16:29:46 +00:00
parent 6ab63682dd
commit bc639c764d
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_box.c
View File

@ -283,7 +283,7 @@ e_box_unpack(Evas_Object *obj)
} }
EAPI void EAPI void
e_box_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) e_box_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -295,7 +295,7 @@ e_box_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
} }
EAPI void EAPI void
e_box_max_size_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh) e_box_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;

4
src/bin/e_box.h
View File

@ -22,8 +22,8 @@ EAPI Evas_Object *e_box_pack_object_first (Evas_Object *obj);
EAPI Evas_Object *e_box_pack_object_last (Evas_Object *obj); EAPI Evas_Object *e_box_pack_object_last (Evas_Object *obj);
EAPI void e_box_pack_options_set (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h); EAPI void e_box_pack_options_set (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
EAPI void e_box_unpack (Evas_Object *obj); EAPI void e_box_unpack (Evas_Object *obj);
EAPI void e_box_min_size_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); EAPI void e_box_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_box_max_size_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh); EAPI void e_box_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
EAPI void e_box_align_get (Evas_Object *obj, double *ax, double *ay); EAPI void e_box_align_get (Evas_Object *obj, double *ax, double *ay);
EAPI void e_box_align_set (Evas_Object *obj, double ax, double ay); EAPI void e_box_align_set (Evas_Object *obj, double ax, double ay);
EAPI void e_box_align_pixel_offset_get (Evas_Object *obj, int *x, int *y); EAPI void e_box_align_pixel_offset_get (Evas_Object *obj, int *x, int *y);

2
src/bin/e_ilist.c
View File

@ -394,7 +394,7 @@ EAPI void
e_ilist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) e_ilist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{ {
API_ENTRY return; API_ENTRY return;
e_box_min_size_get(sd->o_box, w, h); e_box_size_min_get(sd->o_box, w, h);
} }
EAPI void EAPI void

2
src/bin/e_menu.c
View File

@ -1663,7 +1663,7 @@ _e_menu_items_layout_update(E_Menu *m)
e_box_thaw(mi->container_object); e_box_thaw(mi->container_object);
} }
} }
e_box_min_size_get(m->container_object, &bw, &bh); e_box_size_min_get(m->container_object, &bw, &bh);
edje_extern_object_min_size_set(m->container_object, bw, bh); edje_extern_object_min_size_set(m->container_object, bw, bh);
edje_extern_object_max_size_set(m->container_object, bw, bh); edje_extern_object_max_size_set(m->container_object, bw, bh);
edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object); edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object);

2
src/bin/e_test.c
View File

@ -710,7 +710,7 @@ _e_test_internal(E_Container *con)
} }
/* fixme... more */ /* fixme... more */
e_box_min_size_get(ob, &mw, &mh); e_box_size_min_get(ob, &mw, &mh);
evas_object_resize(ob, mw, mh); evas_object_resize(ob, mw, mh);
e_scrollframe_child_set(of, ob); e_scrollframe_child_set(of, ob);

2
src/bin/e_widget_framelist.c
View File

@ -69,7 +69,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj)
mw, mh, /* min */ mw, mh, /* min */
99999, 99999 /* max */ 99999, 99999 /* max */
); );
e_box_min_size_get(wd->o_box, &mw, &mh); e_box_size_min_get(wd->o_box, &mw, &mh);
edje_extern_object_min_size_set(wd->o_box, mw, mh); 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_part_swallow(wd->o_frame, "e.swallow.content", wd->o_box);
edje_object_size_min_calc(wd->o_frame, &mw, &mh); edje_object_size_min_calc(wd->o_frame, &mw, &mh);

2
src/bin/e_widget_list.c
View File

@ -64,7 +64,7 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e
mw, mh, /* min */ mw, mh, /* min */
99999, 99999 /* max */ 99999, 99999 /* max */
); );
e_box_min_size_get(wd->o_box, &mw, &mh); e_box_size_min_get(wd->o_box, &mw, &mh);
e_widget_size_min_set(obj, mw, mh); e_widget_size_min_set(obj, mw, mh);
e_widget_sub_object_add(obj, sobj); e_widget_sub_object_add(obj, sobj);
evas_object_show(sobj); evas_object_show(sobj);

6
src/bin/e_widget_toolbar.c
View File

@ -127,7 +127,7 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
mw, mh, /* min */ mw, mh, /* min */
9999, 9999 /* max */ 9999, 9999 /* max */
); );
e_box_min_size_get(wd->o_box, &mw, &mh); e_box_size_min_get(wd->o_box, &mw, &mh);
evas_object_resize(wd->o_box, mw, mh); evas_object_resize(wd->o_box, mw, mh);
evas_object_resize(wd->o_base, 500, 500); evas_object_resize(wd->o_base, 500, 500);
e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh); e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh);
@ -209,7 +209,7 @@ e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
wd->scrollable = scrollable; wd->scrollable = scrollable;
e_box_min_size_get(wd->o_box, &mw, &mh); e_box_size_min_get(wd->o_box, &mw, &mh);
evas_object_resize(wd->o_box, mw, mh); evas_object_resize(wd->o_box, mw, mh);
evas_object_resize(wd->o_base, 500, 500); evas_object_resize(wd->o_base, 500, 500);
e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh); e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh);
@ -338,7 +338,7 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
if ((!wd->o_base) || (!wd->o_box)) return; if ((!wd->o_base) || (!wd->o_box)) return;
e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh); e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh);
e_box_min_size_get(wd->o_box, &mw, &mh); e_box_size_min_get(wd->o_box, &mw, &mh);
evas_object_geometry_get(wd->o_box, NULL, NULL, &w, &h); evas_object_geometry_get(wd->o_box, NULL, NULL, &w, &h);
if (vw >= mw) if (vw >= mw)
{ {

2
src/modules/everything/evry_view_plugin_tabs.c
View File

@ -26,7 +26,7 @@ _tab_scroll_to(Tab_View *v, Evry_Plugin *p)
n = eina_list_count(s->cur_plugins); n = eina_list_count(s->cur_plugins);
e_box_min_size_get(v->o_tabs, &mw, NULL); e_box_size_min_get(v->o_tabs, &mw, NULL);
evas_object_geometry_get(v->o_tabs, NULL, NULL, &w, NULL); evas_object_geometry_get(v->o_tabs, NULL, NULL, &w, NULL);
if (mw <= w + 5) if (mw <= w + 5)

4
src/modules/illume/e_kbd_int.c
View File

@ -310,7 +310,7 @@ _e_kbd_int_matches_update(E_Kbd_Int *ki)
for (i = 0, l = matches; l; l = l->next, i++) for (i = 0, l = matches; l; l = l->next, i++)
{ {
_e_kbd_int_matches_add(ki, l->data, i); _e_kbd_int_matches_add(ki, l->data, i);
e_box_min_size_get(ki->box_obj, &mw, &mh); e_box_size_min_get(ki->box_obj, &mw, &mh);
edje_object_part_geometry_get(ki->base_obj, "e.swallow.label", edje_object_part_geometry_get(ki->base_obj, "e.swallow.label",
NULL, NULL, &vw, &vh); NULL, NULL, &vw, &vh);
if (mw > vw) break; if (mw > vw) break;
@ -330,7 +330,7 @@ _e_kbd_int_matches_update(E_Kbd_Int *ki)
} }
} }
e_box_thaw(ki->box_obj); e_box_thaw(ki->box_obj);
e_box_min_size_get(ki->box_obj, &mw, &mh); e_box_size_min_get(ki->box_obj, &mw, &mh);
edje_extern_object_min_size_set(ki->box_obj, 0, mh); edje_extern_object_min_size_set(ki->box_obj, 0, mh);
edje_object_part_swallow(ki->base_obj, "e.swallow.label", ki->box_obj); edje_object_part_swallow(ki->base_obj, "e.swallow.label", ki->box_obj);
evas_event_thaw(ki->win->evas); evas_event_thaw(ki->win->evas);

2
src/modules/illume/e_mod_win.c
View File

@ -562,7 +562,7 @@ _cb_resize(void)
h -= flaunch->height; h -= flaunch->height;
if (bx) if (bx)
{ {
e_box_min_size_get(bx, &mw, &mh); e_box_size_min_get(bx, &mw, &mh);
if (mw < w) mw = w; if (mw < w) mw = w;
evas_object_move(sf, x, y); evas_object_move(sf, x, y);
evas_object_resize(bx, mw, mh); evas_object_resize(bx, mw, mh);

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

@ -374,7 +374,7 @@ _e_winlist_size_adjust(void)
int x, y, w, h; int x, y, w, h;
e_box_freeze(list_object); e_box_freeze(list_object);
e_box_min_size_get(list_object, &mw, &mh); e_box_size_min_get(list_object, &mw, &mh);
edje_extern_object_min_size_set(list_object, mw, mh); edje_extern_object_min_size_set(list_object, mw, mh);
edje_object_part_swallow(bg_object, "e.swallow.list", list_object); edje_object_part_swallow(bg_object, "e.swallow.list", list_object);
edje_object_size_min_calc(bg_object, &mw, &mh); edje_object_size_min_calc(bg_object, &mw, &mh);