forked from enlightenment/efl
Let the grid be shrunk when resizing. By Rafael Fonseca.
SVN revision: 48333
This commit is contained in:
parent
52e86cb31c
commit
9c45d6aac5
|
@ -227,10 +227,7 @@ _sizing_eval(Evas_Object *obj)
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
|
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
|
||||||
if (!wd) return;
|
if (!wd) return;
|
||||||
evas_object_size_hint_min_get(wd->scr, &minw, &minh);
|
|
||||||
evas_object_size_hint_max_get(wd->scr, &maxw, &maxh);
|
evas_object_size_hint_max_get(wd->scr, &maxw, &maxh);
|
||||||
if (wd->horizontal) minw = -1;
|
|
||||||
else minh = -1;
|
|
||||||
evas_object_size_hint_min_set(obj, minw, minh);
|
evas_object_size_hint_min_set(obj, minw, minh);
|
||||||
evas_object_size_hint_max_set(obj, maxw, maxh);
|
evas_object_size_hint_max_set(obj, maxw, maxh);
|
||||||
}
|
}
|
||||||
|
@ -1001,10 +998,6 @@ elm_scrolled_grid_add(Evas_Object *parent)
|
||||||
_pan_set, _pan_get,
|
_pan_set, _pan_get,
|
||||||
_pan_max_get, _pan_child_size_get);
|
_pan_max_get, _pan_child_size_get);
|
||||||
|
|
||||||
edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr),
|
|
||||||
&minw, &minh);
|
|
||||||
evas_object_size_hint_min_set(obj, minw, minh);
|
|
||||||
|
|
||||||
_sizing_eval(obj);
|
_sizing_eval(obj);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
|
|
Loading…
Reference in New Issue