forked from enlightenment/efl
elementary: elm_genlist take account of min vertical size hint
SVN revision: 75021
This commit is contained in:
parent
d7a6bc79dd
commit
823b9dded7
|
@ -582,7 +582,7 @@ _elm_genlist_smart_sizing_eval(Evas_Object *obj)
|
||||||
|
|
||||||
if (sd->on_sub_del) return;;
|
if (sd->on_sub_del) return;;
|
||||||
|
|
||||||
evas_object_size_hint_min_get(obj, &minw, NULL);
|
evas_object_size_hint_min_get(obj, &minw, &minh);
|
||||||
evas_object_size_hint_max_get(obj, &maxw, &maxh);
|
evas_object_size_hint_max_get(obj, &maxw, &maxh);
|
||||||
|
|
||||||
edje_object_size_min_calc(ELM_WIDGET_DATA(sd)->resize_obj, &vmw, &vmh);
|
edje_object_size_min_calc(ELM_WIDGET_DATA(sd)->resize_obj, &vmw, &vmh);
|
||||||
|
@ -606,6 +606,7 @@ _elm_genlist_smart_sizing_eval(Evas_Object *obj)
|
||||||
sd->calc_job = ecore_job_add(_calc_job, sd);
|
sd->calc_job = ecore_job_add(_calc_job, sd);
|
||||||
}
|
}
|
||||||
minw = vmw;
|
minw = vmw;
|
||||||
|
if (minh < vmh)
|
||||||
minh = vmh;
|
minh = vmh;
|
||||||
}
|
}
|
||||||
else if (sd->mode == ELM_LIST_LIMIT)
|
else if (sd->mode == ELM_LIST_LIMIT)
|
||||||
|
@ -616,6 +617,7 @@ _elm_genlist_smart_sizing_eval(Evas_Object *obj)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
minw = vmw;
|
minw = vmw;
|
||||||
|
if (minh < vmh)
|
||||||
minh = vmh;
|
minh = vmh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue