From 8c90deecd737cf025ce1c3162e50937639c30f09 Mon Sep 17 00:00:00 2001 From: Subodh Kumar Date: Tue, 23 Jul 2019 09:37:09 +0200 Subject: [PATCH] [elm] Add missing sizing eval hook at check Summary: check is not shown in our Tizen demo. sizing eval missing. @fix Test Plan: NA Reviewers: zmike, Hermet, cedric, bu5hm4n Subscribers: bu5hm4n, #reviewers, #committers Tags: #efl Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D9378 --- src/lib/elementary/efl_ui_check.c | 16 +++++++++++++++- src/lib/elementary/efl_ui_radio.c | 16 +--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 9f575621ff..a5072728ea 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -129,6 +129,19 @@ _efl_ui_check_efl_ui_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check return EINA_TRUE; } +EOLIAN static void +_efl_ui_check_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED) +{ + Evas_Coord minw = -1, minh = -1; + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + + elm_coords_finger_size_adjust(1, &minw, 1, &minh); + edje_object_size_min_restricted_calc + (wd->resize_obj, &minw, &minh, minw, minh); + evas_object_size_hint_min_set(obj, minw, minh); + evas_object_size_hint_max_set(obj, -1, -1); +} + static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) { @@ -396,7 +409,8 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) #define EFL_UI_CHECK_EXTRA_OPS \ ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ - ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX) + ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ + ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_check) #include "efl_ui_check.eo.c" diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index 099001fdb3..edbc14844f 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -181,19 +181,6 @@ _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd EINA_UNUS return int_ret; } -EOLIAN static void -_efl_ui_radio_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED) -{ - Evas_Coord minw = -1, minh = -1; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - - elm_coords_finger_size_adjust(1, &minw, 1, &minh); - edje_object_size_min_restricted_calc - (wd->resize_obj, &minw, &minh, minw, minh); - evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, -1, -1); -} - static void _radio_on_cb(void *data, Evas_Object *obj EINA_UNUSED, @@ -327,8 +314,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_radio, Efl_Ui_Radio_Data) ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) #define EFL_UI_RADIO_EXTRA_OPS \ - ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ - ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_radio) + ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX) #include "efl_ui_radio.eo.c" #include "efl_ui_radio_group.eo.c"