summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-07-25 16:56:15 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-07-25 19:13:15 +0900
commit96fbea9daecf7040ac63203c4823722fa6d5d73f (patch)
treed69d1d4b2098b8f1083e4d77f8fdef834e249805
parent1fbc4919041bc49bded2d60a8744029c94887bad (diff)
elm table and box resize themselves on sizing eval - fix this - dont resize
thsi fixes T3031 @fix
-rw-r--r--src/lib/elementary/elm_box.c19
-rw-r--r--src/lib/elementary/elm_table.c13
2 files changed, 5 insertions, 27 deletions
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index adb080f1fb..9532f8f175 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -123,29 +123,16 @@ static void
123_sizing_eval(Evas_Object *obj) 123_sizing_eval(Evas_Object *obj)
124{ 124{
125 Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; 125 Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
126 Evas_Coord w, h;
127 126
128 ELM_BOX_DATA_GET(obj, sd); 127 ELM_BOX_DATA_GET(obj, sd);
129 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 128 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
130 129
131 if (sd->delete_me) 130 if (sd->delete_me) return;
132 return;
133
134 efl_gfx_size_hint_combined_min_get
135 (wd->resize_obj, &minw, &minh);
136
137 evas_object_size_hint_max_get
138 (wd->resize_obj, &maxw, &maxh);
139 131
132 efl_gfx_size_hint_combined_min_get(wd->resize_obj, &minw, &minh);
133 evas_object_size_hint_max_get(wd->resize_obj, &maxw, &maxh);
140 evas_object_size_hint_min_set(obj, minw, minh); 134 evas_object_size_hint_min_set(obj, minw, minh);
141 evas_object_size_hint_max_set(obj, maxw, maxh); 135 evas_object_size_hint_max_set(obj, maxw, maxh);
142
143 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
144 if (w < minw) w = minw;
145 if (h < minh) h = minh;
146 if ((maxw >= 0) && (w > maxw)) w = maxw;
147 if ((maxh >= 0) && (h > maxh)) h = maxh;
148 evas_object_resize(obj, w, h);
149} 136}
150 137
151static void 138static void
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index c6432eaf42..e318b19d07 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -122,22 +122,13 @@ static void
122_sizing_eval(Evas_Object *obj) 122_sizing_eval(Evas_Object *obj)
123{ 123{
124 Evas_Coord minw = 0, minh = 0, maxw = -1, maxh = -1; 124 Evas_Coord minw = 0, minh = 0, maxw = -1, maxh = -1;
125 Evas_Coord w, h;
126 125
127 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 126 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
128 127
129 efl_gfx_size_hint_combined_min_get 128 efl_gfx_size_hint_combined_min_get(wd->resize_obj, &minw, &minh);
130 (wd->resize_obj, &minw, &minh); 129 evas_object_size_hint_max_get(wd->resize_obj, &maxw, &maxh);
131 evas_object_size_hint_max_get
132 (wd->resize_obj, &maxw, &maxh);
133 evas_object_size_hint_min_set(obj, minw, minh); 130 evas_object_size_hint_min_set(obj, minw, minh);
134 evas_object_size_hint_max_set(obj, maxw, maxh); 131 evas_object_size_hint_max_set(obj, maxw, maxh);
135 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
136 if (w < minw) w = minw;
137 if (h < minh) h = minh;
138 if ((maxw >= 0) && (w > maxw)) w = maxw;
139 if ((maxh >= 0) && (h > maxh)) h = maxh;
140 evas_object_resize(obj, w, h);
141} 132}
142 133
143static void 134static void