From b89e7b35009c7fafffdf62a0e625fefc2d44b3b7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 1 Aug 2019 09:20:34 -0400 Subject: [PATCH] efl_ui/tags: use user size hints for internal objects restricted min size hint should only be set by an object's own group_calc function. all other cases should use regular min size hint Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D9477 --- src/lib/elementary/efl_ui_tags.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c index eb30e4ddca..daecd0b1c1 100644 --- a/src/lib/elementary/efl_ui_tags.c +++ b/src/lib/elementary/efl_ui_tags.c @@ -119,7 +119,7 @@ _shrink_mode_set(Eo *obj, edje_object_size_min_calc(sd->end, &w_label_count, &h); elm_coords_finger_size_adjust(1, &w_label_count, 1, &h); - efl_gfx_hint_size_restricted_min_set(sd->end, EINA_SIZE2D(w_label_count, h)); + efl_gfx_hint_size_min_set(sd->end, EINA_SIZE2D(w_label_count, h)); efl_pack(sd->box, sd->end); evas_object_show(sd->end); @@ -425,7 +425,7 @@ _item_new(Efl_Ui_Tags_Data *sd, if (sd->w_box && min.w > r.w) { elm_coords_finger_size_adjust(1, &r.w, 1, &min.h); - efl_gfx_hint_size_restricted_min_set(layout, EINA_SIZE2D(r.w, min.h)); + efl_gfx_hint_size_min_set(layout, EINA_SIZE2D(r.w, min.h)); efl_gfx_entity_size_set(layout, EINA_SIZE2D(r.w, min.h)); } @@ -514,7 +514,7 @@ _box_resize_cb(void *data, if (min.w > r.w - hpad) { min.w = r.w - hpad; - efl_gfx_hint_size_restricted_min_set(layout, EINA_SIZE2D(min.w, min.h)); + efl_gfx_hint_size_min_set(layout, EINA_SIZE2D(min.w, min.h)); efl_gfx_entity_size_set(layout, EINA_SIZE2D(min.w, min.h)); } } @@ -762,7 +762,7 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd) efl_text_interactive_editable_set(efl_added, EINA_TRUE), efl_composite_attach(obj, efl_added)); - efl_gfx_hint_size_restricted_min_set(sd->entry, EINA_SIZE2D(MIN_W_ENTRY, 0)); + efl_gfx_hint_size_min_set(sd->entry, EINA_SIZE2D(MIN_W_ENTRY, 0)); efl_gfx_hint_weight_set(sd->entry, EFL_GFX_HINT_EXPAND, 0); efl_gfx_hint_fill_set(sd->entry, EINA_TRUE, EINA_FALSE); @@ -779,7 +779,7 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd) edje_object_size_min_calc(sd->end, &button_min_width, &button_min_height); elm_coords_finger_size_adjust(1, &button_min_width, 1, &button_min_height); - efl_gfx_hint_size_restricted_min_set(sd->end, EINA_SIZE2D(button_min_width, button_min_height)); + efl_gfx_hint_size_min_set(sd->end, EINA_SIZE2D(button_min_width, button_min_height)); elm_widget_sub_object_add(obj, sd->end); } }