From 59769731115f0426c21e6b82d8def157e71ad2d1 Mon Sep 17 00:00:00 2001 From: Alex-I-B <56608879+Alex-I-B@users.noreply.github.com> Date: Mon, 31 Aug 2020 14:18:07 +0200 Subject: [PATCH] Proposed fix for roller widget crash when LV_USE_GROUP=0 (#1761) Removed LV_USE_GROUP guard macro for signals != LV_SIGNAL_CONTROL in signal functions of roller and spinbox to allow signal propagating to ancestors --- src/lv_widgets/lv_roller.c | 2 -- src/lv_widgets/lv_spinbox.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/lv_widgets/lv_roller.c b/src/lv_widgets/lv_roller.c index 277ff6ec3..b412470b4 100644 --- a/src/lv_widgets/lv_roller.c +++ b/src/lv_widgets/lv_roller.c @@ -585,10 +585,8 @@ static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * par /* Include the ancient signal function */ if(sign != LV_SIGNAL_CONTROL) { /*Don't let the page to scroll on keys*/ -#if LV_USE_GROUP res = ancestor_signal(roller, sign, param); if(res != LV_RES_OK) return res; -#endif } if(sign == LV_SIGNAL_GET_TYPE) return lv_obj_handle_get_type_signal(param, LV_OBJX_NAME); diff --git a/src/lv_widgets/lv_spinbox.c b/src/lv_widgets/lv_spinbox.c index 1fac9de80..28f2de153 100644 --- a/src/lv_widgets/lv_spinbox.c +++ b/src/lv_widgets/lv_spinbox.c @@ -390,10 +390,8 @@ static lv_res_t lv_spinbox_signal(lv_obj_t * spinbox, lv_signal_t sign, void * p /* Include the ancient signal function */ if(sign != LV_SIGNAL_CONTROL) { -#if LV_USE_GROUP res = ancestor_signal(spinbox, sign, param); if(res != LV_RES_OK) return res; -#endif } if(sign == LV_SIGNAL_GET_TYPE) return lv_obj_handle_get_type_signal(param, LV_OBJX_NAME);