Fix API Inconsistency:
e_ilist_min_size_* to e_ilist_size_min_* SVN revision: 42163
This commit is contained in:
parent
bc639c764d
commit
3e1c0d622a
|
@ -391,7 +391,7 @@ e_ilist_multi_select_set(Evas_Object *obj, int multi)
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
e_ilist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
e_ilist_size_min_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
||||||
{
|
{
|
||||||
API_ENTRY return;
|
API_ENTRY return;
|
||||||
e_box_size_min_get(sd->o_box, w, h);
|
e_box_size_min_get(sd->o_box, w, h);
|
||||||
|
|
|
@ -34,7 +34,7 @@ EAPI int e_ilist_selector_get (Evas_Object *obj);
|
||||||
EAPI void e_ilist_selector_set (Evas_Object *obj, int selector);
|
EAPI void e_ilist_selector_set (Evas_Object *obj, int selector);
|
||||||
EAPI int e_ilist_multi_select_get (Evas_Object *obj);
|
EAPI int e_ilist_multi_select_get (Evas_Object *obj);
|
||||||
EAPI void e_ilist_multi_select_set (Evas_Object *obj, int multi);
|
EAPI void e_ilist_multi_select_set (Evas_Object *obj, int multi);
|
||||||
EAPI void e_ilist_min_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
|
EAPI void e_ilist_size_min_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
|
||||||
EAPI void e_ilist_unselect (Evas_Object *obj);
|
EAPI void e_ilist_unselect (Evas_Object *obj);
|
||||||
EAPI void e_ilist_selected_set (Evas_Object *obj, int n);
|
EAPI void e_ilist_selected_set (Evas_Object *obj, int n);
|
||||||
EAPI int e_ilist_selected_get (Evas_Object *obj);
|
EAPI int e_ilist_selected_get (Evas_Object *obj);
|
||||||
|
|
|
@ -262,7 +262,7 @@ _e_test_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
Evas_Coord mw, mh, vw, vh, w, h;
|
Evas_Coord mw, mh, vw, vh, w, h;
|
||||||
|
|
||||||
e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
|
e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
|
||||||
e_ilist_min_size_get(data, &mw, &mh);
|
e_ilist_size_min_get(data, &mw, &mh);
|
||||||
evas_object_geometry_get(data, NULL, NULL, &w, &h);
|
evas_object_geometry_get(data, NULL, NULL, &w, &h);
|
||||||
if (vw >= mw)
|
if (vw >= mw)
|
||||||
{
|
{
|
||||||
|
@ -327,7 +327,7 @@ _e_test_internal(E_Container *con)
|
||||||
e_icon_file_set(o3, "/home/raster/C/stuff/icons/cd.png");
|
e_icon_file_set(o3, "/home/raster/C/stuff/icons/cd.png");
|
||||||
e_ilist_append(o, o3, "Norbert", 0, _e_test_sel, NULL, NULL, NULL);
|
e_ilist_append(o, o3, "Norbert", 0, _e_test_sel, NULL, NULL, NULL);
|
||||||
|
|
||||||
e_ilist_min_size_get(o, &mw, &mh);
|
e_ilist_size_min_get(o, &mw, &mh);
|
||||||
evas_object_resize(o, mw, mh);
|
evas_object_resize(o, mw, mh);
|
||||||
evas_object_focus_set(o, 1);
|
evas_object_focus_set(o, 1);
|
||||||
evas_object_show(o);
|
evas_object_show(o);
|
||||||
|
|
|
@ -449,7 +449,7 @@ e_widget_ilist_go(Evas_Object *obj)
|
||||||
|
|
||||||
wd = e_widget_data_get(obj);
|
wd = e_widget_data_get(obj);
|
||||||
wd->o_widget = obj;
|
wd->o_widget = obj;
|
||||||
e_ilist_min_size_get(wd->o_ilist, &mw, &mh);
|
e_ilist_size_min_get(wd->o_ilist, &mw, &mh);
|
||||||
evas_object_resize(wd->o_ilist, mw, mh);
|
evas_object_resize(wd->o_ilist, mw, mh);
|
||||||
e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
|
e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
|
||||||
evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &w, &h);
|
evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &w, &h);
|
||||||
|
@ -726,7 +726,7 @@ e_widget_ilist_preferred_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h
|
||||||
evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &ww, &hh);
|
evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &ww, &hh);
|
||||||
evas_object_resize(wd->o_scrollframe, 200, 200);
|
evas_object_resize(wd->o_scrollframe, 200, 200);
|
||||||
e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
|
e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
|
||||||
e_ilist_min_size_get(wd->o_ilist, &mw, &mh);
|
e_ilist_size_min_get(wd->o_ilist, &mw, &mh);
|
||||||
evas_object_resize(wd->o_scrollframe, ww, hh);
|
evas_object_resize(wd->o_scrollframe, ww, hh);
|
||||||
if (w) *w = 200 - vw + mw;
|
if (w) *w = 200 - vw + mw;
|
||||||
if (h) *h = 200 - vh + mh;
|
if (h) *h = 200 - vh + mh;
|
||||||
|
@ -772,7 +772,7 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
|
||||||
Evas_Coord mw, mh, vw, vh, w, h;
|
Evas_Coord mw, mh, vw, vh, w, h;
|
||||||
|
|
||||||
e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
|
e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
|
||||||
e_ilist_min_size_get(data, &mw, &mh);
|
e_ilist_size_min_get(data, &mw, &mh);
|
||||||
evas_object_geometry_get(data, NULL, NULL, &w, &h);
|
evas_object_geometry_get(data, NULL, NULL, &w, &h);
|
||||||
if (vw >= mw)
|
if (vw >= mw)
|
||||||
{
|
{
|
||||||
|
|
|
@ -263,7 +263,7 @@ _cb_object_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
|
|
||||||
d = evas_object_data_get(obj, "..[winilist]");
|
d = evas_object_data_get(obj, "..[winilist]");
|
||||||
if (!d) return;
|
if (!d) return;
|
||||||
e_ilist_min_size_get(d->o_ilist, &lw, &lh);
|
e_ilist_size_min_get(d->o_ilist, &lw, &lh);
|
||||||
if (lh < (120 * e_scale)) lh = 120 * e_scale;
|
if (lh < (120 * e_scale)) lh = 120 * e_scale;
|
||||||
printf("%i\n", lh);
|
printf("%i\n", lh);
|
||||||
e_scrollframe_child_viewport_size_get(d->o_frame, &vw, &vh);
|
e_scrollframe_child_viewport_size_get(d->o_frame, &vw, &vh);
|
||||||
|
@ -403,7 +403,7 @@ _refill(Data *d)
|
||||||
e_ilist_thaw(d->o_ilist);
|
e_ilist_thaw(d->o_ilist);
|
||||||
|
|
||||||
/* FIXME: figure out optimal size */
|
/* FIXME: figure out optimal size */
|
||||||
e_ilist_min_size_get(d->o_ilist, &lw, &lh);
|
e_ilist_size_min_get(d->o_ilist, &lw, &lh);
|
||||||
if (lh < (120 * e_scale)) lh = 120 * e_scale;
|
if (lh < (120 * e_scale)) lh = 120 * e_scale;
|
||||||
printf("%i\n", lh);
|
printf("%i\n", lh);
|
||||||
e_scrollframe_child_viewport_size_get(d->o_frame, &vw, &vh);
|
e_scrollframe_child_viewport_size_get(d->o_frame, &vw, &vh);
|
||||||
|
|
Loading…
Reference in New Issue