forked from enlightenment/efl
elm table and box resize themselves on sizing eval - fix this - dont resize
thsi fixes T3031 @fix
This commit is contained in:
parent
1fbc491904
commit
96fbea9dae
|
@ -123,29 +123,16 @@ static void
|
||||||
_sizing_eval(Evas_Object *obj)
|
_sizing_eval(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
|
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
|
||||||
Evas_Coord w, h;
|
|
||||||
|
|
||||||
ELM_BOX_DATA_GET(obj, sd);
|
ELM_BOX_DATA_GET(obj, sd);
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
||||||
|
|
||||||
if (sd->delete_me)
|
if (sd->delete_me) return;
|
||||||
return;
|
|
||||||
|
|
||||||
efl_gfx_size_hint_combined_min_get
|
|
||||||
(wd->resize_obj, &minw, &minh);
|
|
||||||
|
|
||||||
evas_object_size_hint_max_get
|
|
||||||
(wd->resize_obj, &maxw, &maxh);
|
|
||||||
|
|
||||||
|
efl_gfx_size_hint_combined_min_get(wd->resize_obj, &minw, &minh);
|
||||||
|
evas_object_size_hint_max_get(wd->resize_obj, &maxw, &maxh);
|
||||||
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);
|
||||||
|
|
||||||
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
|
|
||||||
if (w < minw) w = minw;
|
|
||||||
if (h < minh) h = minh;
|
|
||||||
if ((maxw >= 0) && (w > maxw)) w = maxw;
|
|
||||||
if ((maxh >= 0) && (h > maxh)) h = maxh;
|
|
||||||
evas_object_resize(obj, w, h);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -122,22 +122,13 @@ static void
|
||||||
_sizing_eval(Evas_Object *obj)
|
_sizing_eval(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Evas_Coord minw = 0, minh = 0, maxw = -1, maxh = -1;
|
Evas_Coord minw = 0, minh = 0, maxw = -1, maxh = -1;
|
||||||
Evas_Coord w, h;
|
|
||||||
|
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
||||||
|
|
||||||
efl_gfx_size_hint_combined_min_get
|
efl_gfx_size_hint_combined_min_get(wd->resize_obj, &minw, &minh);
|
||||||
(wd->resize_obj, &minw, &minh);
|
evas_object_size_hint_max_get(wd->resize_obj, &maxw, &maxh);
|
||||||
evas_object_size_hint_max_get
|
|
||||||
(wd->resize_obj, &maxw, &maxh);
|
|
||||||
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);
|
||||||
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
|
|
||||||
if (w < minw) w = minw;
|
|
||||||
if (h < minh) h = minh;
|
|
||||||
if ((maxw >= 0) && (w > maxw)) w = maxw;
|
|
||||||
if ((maxh >= 0) && (h > maxh)) h = maxh;
|
|
||||||
evas_object_resize(obj, w, h);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue