github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proposed fix for roller widget crash when LV_USE_GROUP=0 (#1761)

Browse Source 
Removed LV_USE_GROUP guard macro for signals != LV_SIGNAL_CONTROL in signal functions of roller and spinbox to allow signal propagating to ancestors
This commit is contained in:
Alex-I-B
2020-08-31 14:18:07 +02:00
committed by GitHub
parent 91cfb70856
commit 5976973111
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lv_widgets/lv_roller.c
View File

@@ -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 */ /* Include the ancient signal function */
if(sign != LV_SIGNAL_CONTROL) { /*Don't let the page to scroll on keys*/ if(sign != LV_SIGNAL_CONTROL) { /*Don't let the page to scroll on keys*/
#if LV_USE_GROUP
res = ancestor_signal(roller, sign, param); res = ancestor_signal(roller, sign, param);
if(res != LV_RES_OK) return res; 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); if(sign == LV_SIGNAL_GET_TYPE) return lv_obj_handle_get_type_signal(param, LV_OBJX_NAME);

2
src/lv_widgets/lv_spinbox.c
View File

@@ -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 */ /* Include the ancient signal function */
if(sign != LV_SIGNAL_CONTROL) { if(sign != LV_SIGNAL_CONTROL) {
#if LV_USE_GROUP
res = ancestor_signal(spinbox, sign, param); res = ancestor_signal(spinbox, sign, param);
if(res != LV_RES_OK) return res; 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); if(sign == LV_SIGNAL_GET_TYPE) return lv_obj_handle_get_type_signal(param, LV_OBJX_NAME);