enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

elm table and box resize themselves on sizing eval - fix this - dont resize 

thsi fixes T3031

@fix
This commit is contained in:
Carsten Haitzler 2016-07-25 16:56:15 +09:00
parent 1fbc491904
commit 96fbea9dae
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/elementary/elm_box.c
View File

@ -123,29 +123,16 @@ static void
_sizing_eval(Evas_Object *obj)
{
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
Evas_Coord w, h;
ELM_BOX_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd->delete_me)
return;
efl_gfx_size_hint_combined_min_get
(wd->resize_obj, &minw, &minh);
evas_object_size_hint_max_get
(wd->resize_obj, &maxw, &maxh);
if (sd->delete_me) return;
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_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

13
src/lib/elementary/elm_table.c
View File

@ -122,22 +122,13 @@ static void
_sizing_eval(Evas_Object *obj)
{
Evas_Coord minw = 0, minh = 0, maxw = -1, maxh = -1;
Evas_Coord w, h;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
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_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