summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_calc.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 14:49:08 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 14:57:52 +0900
commit7d2b4b69166c0f2abaf0f0bdec3b0d04eb721517 (patch)
treec82ef99a638b25a02df5ba201522efe22d76ce92 /src/lib/edje/edje_calc.c
parent3bff7363b54b541aa78d8ed0f743631582086a95 (diff)
efl: Use Eina.Size2D for size hint restricted min
This is the "internal" or "intrinsic" minimum size, to be set by EFL and not by applications.
Diffstat (limited to 'src/lib/edje/edje_calc.c')
-rw-r--r--src/lib/edje/edje_calc.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 16d30218b5..1500ab0e8e 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -933,12 +933,12 @@ _edje_recalc_do(Edje *ed)
933 933
934 if (ed->update_hints && ed->recalc_hints && !ed->calc_only) 934 if (ed->update_hints && ed->recalc_hints && !ed->calc_only)
935 { 935 {
936 Evas_Coord w, h; 936 Eina_Size2D min;
937 937
938 ed->recalc_hints = EINA_FALSE; 938 ed->recalc_hints = EINA_FALSE;
939 939
940 edje_object_size_min_calc(ed->obj, &w, &h); 940 edje_object_size_min_calc(ed->obj, &min.w, &min.h);
941 efl_gfx_size_hint_restricted_min_set(ed->obj, w, h); 941 efl_gfx_size_hint_restricted_min_set(ed->obj, min);
942 } 942 }
943 943
944 if (!ed->collection) return; 944 if (!ed->collection) return;
@@ -3415,36 +3415,36 @@ _edje_part_recalc_single(Edje *ed,
3415 (((((Edje_Part_Description_Table *)chosen_desc)->table.min.h) || 3415 (((((Edje_Part_Description_Table *)chosen_desc)->table.min.h) ||
3416 (((Edje_Part_Description_Table *)chosen_desc)->table.min.v)))) 3416 (((Edje_Part_Description_Table *)chosen_desc)->table.min.v))))
3417 { 3417 {
3418 Evas_Coord lminw = 0, lminh = 0; 3418 Eina_Size2D lmin;
3419 3419
3420 efl_canvas_group_need_recalculate_set(ep->object, 1); 3420 efl_canvas_group_need_recalculate_set(ep->object, 1);
3421 efl_canvas_group_calculate(ep->object); 3421 efl_canvas_group_calculate(ep->object);
3422 efl_gfx_size_hint_restricted_min_get(ep->object, &lminw, &lminh); 3422 lmin = efl_gfx_size_hint_restricted_min_get(ep->object);
3423 if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h) 3423 if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h)
3424 { 3424 {
3425 if (lminw > minw) minw = lminw; 3425 if (lmin.w > minw) minw = lmin.w;
3426 } 3426 }
3427 if (((Edje_Part_Description_Table *)chosen_desc)->table.min.v) 3427 if (((Edje_Part_Description_Table *)chosen_desc)->table.min.v)
3428 { 3428 {
3429 if (lminh > minh) minh = lminh; 3429 if (lmin.h > minh) minh = lmin.h;
3430 } 3430 }
3431 } 3431 }
3432 else if ((ep->part->type == EDJE_PART_TYPE_BOX) && 3432 else if ((ep->part->type == EDJE_PART_TYPE_BOX) &&
3433 ((((Edje_Part_Description_Box *)chosen_desc)->box.min.h) || 3433 ((((Edje_Part_Description_Box *)chosen_desc)->box.min.h) ||
3434 (((Edje_Part_Description_Box *)chosen_desc)->box.min.v))) 3434 (((Edje_Part_Description_Box *)chosen_desc)->box.min.v)))
3435 { 3435 {
3436 Evas_Coord lminw = 0, lminh = 0; 3436 Eina_Size2D lmin;
3437 3437
3438 efl_canvas_group_need_recalculate_set(ep->object, 1); 3438 efl_canvas_group_need_recalculate_set(ep->object, 1);
3439 efl_canvas_group_calculate(ep->object); 3439 efl_canvas_group_calculate(ep->object);
3440 efl_gfx_size_hint_restricted_min_get(ep->object, &lminw, &lminh); 3440 lmin = efl_gfx_size_hint_restricted_min_get(ep->object);
3441 if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h) 3441 if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h)
3442 { 3442 {
3443 if (lminw > minw) minw = lminw; 3443 if (lmin.w > minw) minw = lmin.w;
3444 } 3444 }
3445 if (((Edje_Part_Description_Box *)chosen_desc)->box.min.v) 3445 if (((Edje_Part_Description_Box *)chosen_desc)->box.min.v)
3446 { 3446 {
3447 if (lminh > minh) minh = lminh; 3447 if (lmin.h > minh) minh = lmin.h;
3448 } 3448 }
3449 } 3449 }
3450 else if (ep->part->type == EDJE_PART_TYPE_IMAGE) 3450 else if (ep->part->type == EDJE_PART_TYPE_IMAGE)