From 56c4cab22834274bc05acb0ae428b118eb1a026a Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 9 Oct 2020 10:34:02 +0200 Subject: [PATCH] skip objects in groups if they are in disabled state --- CHANGELOG.md | 1 + src/lv_core/lv_group.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e225b33ee..c8af440c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Fix imgbtn state change - Support RTL in table (draw columns right to left) - Support RTL in pretty layout (draw columns right to left) +- Skip objects in groups if they are in disabled state ## v7.6.1 (06.10.2020) diff --git a/src/lv_core/lv_group.c b/src/lv_core/lv_group.c index 329e1fc69..dd664c3c1 100644 --- a/src/lv_core/lv_group.c +++ b/src/lv_core/lv_group.c @@ -488,8 +488,9 @@ static void focus_next_core(lv_group_t * group, void * (*begin)(const lv_ll_t *) can_move = true; if(obj_next == NULL) continue; + if(lv_obj_get_state(*obj_next, LV_OBJ_PART_MAIN) & LV_STATE_DISABLED) continue; - /*Hidden objects don't receive focus*/ + /*Hidden and disabled objects don't receive focus*/ if(!lv_obj_get_hidden(*obj_next)) break; }