summaryrefslogtreecommitdiff
path: root/src/lib/elementary/els_box.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 16:22:01 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 16:33:33 +0900
commita72f3ec64ec8dfc20c68e1b471a6374a04058f8b (patch)
treea034aff82d8f21f10aa3eaa7ddbce58c9ac92c39 /src/lib/elementary/els_box.c
parent7d2b4b69166c0f2abaf0f0bdec3b0d04eb721517 (diff)
efl: Use Eina.Size2D for size hint combined min
For this patch I decided to add a pseudo legacy wrapper as the function is called in a very large number of places. Fixing all those calls to use the size2d form is a lot of work and a greater risk of b0rking something.
Diffstat (limited to 'src/lib/elementary/els_box.c')
-rw-r--r--src/lib/elementary/els_box.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/elementary/els_box.c b/src/lib/elementary/els_box.c
index 2be9290..965cd98 100644
--- a/src/lib/elementary/els_box.c
+++ b/src/lib/elementary/els_box.c
@@ -148,7 +148,7 @@ _smart_extents_non_homogeneous_calc(Evas_Object_Box_Data *priv, int w, int h, in
148 rrw = &oh, rrh = &ow; 148 rrw = &oh, rrh = &ow;
149 149
150 evas_object_size_hint_padding_get(opt->obj, &pad_l, &pad_r, &pad_t, &pad_b); 150 evas_object_size_hint_padding_get(opt->obj, &pad_l, &pad_r, &pad_t, &pad_b);
151 efl_gfx_size_hint_combined_min_get(opt->obj, &mnw, &mnh); 151 evas_object_size_hint_combined_min_get(opt->obj, &mnw, &mnh);
152 mnw += pad_l + pad_r; 152 mnw += pad_l + pad_r;
153 mnh += pad_t + pad_b; 153 mnh += pad_t + pad_b;
154 if (*rminw < *rw) *rminw = *rw; 154 if (*rminw < *rw) *rminw = *rw;
@@ -254,7 +254,7 @@ _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int w, in
254 if (ay < 0) fh = 1; 254 if (ay < 0) fh = 1;
255 255
256 evas_object_size_hint_padding_get(opt->obj, &pad_l, &pad_r, &pad_t, &pad_b); 256 evas_object_size_hint_padding_get(opt->obj, &pad_l, &pad_r, &pad_t, &pad_b);
257 efl_gfx_size_hint_combined_min_get(opt->obj, &mnw, &mnh); 257 evas_object_size_hint_combined_min_get(opt->obj, &mnw, &mnh);
258 mnw += pad_l + pad_r; 258 mnw += pad_l + pad_r;
259 mnh += pad_t + pad_b; 259 mnh += pad_t + pad_b;
260 if (minh < mnh) minh = mnh; 260 if (minh < mnh) minh = mnh;
@@ -375,7 +375,7 @@ _els_box_layout(Evas_Object *o, Evas_Object_Box_Data *priv, Eina_Bool horizontal
375 _smart_extents_calculate(o, priv, w, h, expand, horizontal, homogeneous); 375 _smart_extents_calculate(o, priv, w, h, expand, horizontal, homogeneous);
376 evas_object_geometry_get(o, &x, &y, &w, &h); 376 evas_object_geometry_get(o, &x, &y, &w, &h);
377 377
378 efl_gfx_size_hint_combined_min_get(o, &minw, &minh); 378 evas_object_size_hint_combined_min_get(o, &minw, &minh);
379 evas_object_box_align_get(o, &ax, &ay); 379 evas_object_box_align_get(o, &ax, &ay);
380 /* if object size is less than min, apply align to trigger viewporting */ 380 /* if object size is less than min, apply align to trigger viewporting */
381 if (w < minw) 381 if (w < minw)
@@ -418,7 +418,7 @@ _els_box_layout(Evas_Object *o, Evas_Object_Box_Data *priv, Eina_Bool horizontal
418 evas_object_size_hint_align_get(obj, &ax, &ay); 418 evas_object_size_hint_align_get(obj, &ax, &ay);
419 evas_object_size_hint_weight_get(obj, &wx, &wy); 419 evas_object_size_hint_weight_get(obj, &wx, &wy);
420 evas_object_size_hint_padding_get(obj, &pad_l, &pad_r, &pad_t, &pad_b); 420 evas_object_size_hint_padding_get(obj, &pad_l, &pad_r, &pad_t, &pad_b);
421 efl_gfx_size_hint_combined_min_get(obj, &mnw, &mnh); 421 evas_object_size_hint_combined_min_get(obj, &mnw, &mnh);
422 mnw += pad_l + pad_r; 422 mnw += pad_l + pad_r;
423 mnh += pad_t + pad_b; 423 mnh += pad_t + pad_b;
424 evas_object_size_hint_max_get(obj, &mxw, &mxh); 424 evas_object_size_hint_max_get(obj, &mxw, &mxh);