forked from enlightenment/efl
elementary/scrollers - added minor exceptios.
SVN revision: 57702
This commit is contained in:
parent
2f6a61ac06
commit
3d570dd8d3
|
@ -282,9 +282,12 @@ _sizing_eval(Evas_Object *obj)
|
||||||
double xw, yw;
|
double xw, yw;
|
||||||
|
|
||||||
if (!wd) return;
|
if (!wd) return;
|
||||||
evas_object_size_hint_min_get(wd->content, &minw, &minh);
|
if (wd->content)
|
||||||
evas_object_size_hint_max_get(wd->content, &maxw, &maxh);
|
{
|
||||||
evas_object_size_hint_weight_get(wd->content, &xw, &yw);
|
evas_object_size_hint_min_get(wd->content, &minw, &minh);
|
||||||
|
evas_object_size_hint_max_get(wd->content, &maxw, &maxh);
|
||||||
|
evas_object_size_hint_weight_get(wd->content, &xw, &yw);
|
||||||
|
}
|
||||||
if (wd->scr)
|
if (wd->scr)
|
||||||
{
|
{
|
||||||
elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
|
elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
|
||||||
|
@ -300,7 +303,7 @@ _sizing_eval(Evas_Object *obj)
|
||||||
else if ((maxh > 0) && (vh > maxh)) vh = maxh;
|
else if ((maxh > 0) && (vh > maxh)) vh = maxh;
|
||||||
}
|
}
|
||||||
else if (minh > 0) vh = minh;
|
else if (minh > 0) vh = minh;
|
||||||
evas_object_resize(wd->content, vw, vh);
|
if (wd->content) evas_object_resize(wd->content, vw, vh);
|
||||||
w = -1;
|
w = -1;
|
||||||
h = -1;
|
h = -1;
|
||||||
edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh);
|
edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh);
|
||||||
|
|
|
@ -1090,6 +1090,7 @@ void
|
||||||
elm_smart_scroller_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
elm_smart_scroller_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
||||||
{
|
{
|
||||||
API_ENTRY return;
|
API_ENTRY return;
|
||||||
|
if (!sd->pan_obj) return;
|
||||||
edje_object_calc_force(sd->edje_obj);
|
edje_object_calc_force(sd->edje_obj);
|
||||||
evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h);
|
evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue