zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=51a644d96650d08f8ffa8e633277d60e9536f08f
commit 51a644d96650d08f8ffa8e633277d60e9536f08f Author: Yeongjong Lee <[email protected]> Date: Wed Aug 14 09:56:42 2019 -0400 efl_ui: remove duplicated hint_min_set code Summary: evas_object_size_hint_min_set call efl_gfx_hint_size_restricted_min_set internally. Reviewers: zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9567 --- src/lib/elementary/efl_ui_flip.c | 5 +---- src/lib/elementary/efl_ui_frame.c | 5 +---- src/lib/elementary/efl_ui_image.c | 5 +---- src/lib/elementary/efl_ui_image_zoomable.c | 10 ++-------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index d6e9152146..e24583796d 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -93,10 +93,7 @@ _sizing_eval(Evas_Object *obj) elm_coords_finger_size_adjust(fingx, &minw, fingy, &minh); - if (elm_widget_is_legacy(obj)) - evas_object_size_hint_min_set(obj, minw, minh); - else - efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); evas_object_size_hint_max_set(obj, maxw, maxh); } diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c index 1f167fb495..5680fdf901 100644 --- a/src/lib/elementary/efl_ui_frame.c +++ b/src/lib/elementary/efl_ui_frame.c @@ -38,10 +38,7 @@ _sizing_eval(Evas_Object *obj, evas_object_size_hint_min_get(obj, &cminw, &cminh); if ((minw == cminw) && (minh == cminh)) return; - if (elm_widget_is_legacy(obj)) - evas_object_size_hint_min_set(obj, minw, minh); - else - efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); evas_object_size_hint_max_set(obj, -1, -1); } diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 68403700be..c07f2b2ca4 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -802,10 +802,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj) } } - if (elm_widget_is_legacy(obj)) - evas_object_size_hint_min_set(obj, minw, minh); - else - efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); evas_object_size_hint_max_set(obj, maxw, maxh); if (sd->img) diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 4b76f6bde4..64eda7a52d 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -116,10 +116,7 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_get (wd->resize_obj, &maxw, &maxh); - if (elm_widget_is_legacy(obj)) - evas_object_size_hint_min_set(obj, minw, minh); - else - efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); evas_object_size_hint_max_set(obj, maxw, maxh); } @@ -1864,10 +1861,7 @@ _efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable (priv->img, EVAS_CALLBACK_IMAGE_PRELOADED, _main_img_preloaded_cb, obj); edje_object_size_min_calc(edje, &minw, &minh); - if (elm_widget_is_legacy(obj)) - evas_object_size_hint_min_set(obj, minw, minh); - else - efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); + efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); _efl_ui_image_zoomable_edje_object_attach(obj); --
