From 77e7fe7feaf270f9947c0107d49d9fcbbb7c52e0 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 23 Nov 2020 16:36:08 +0100 Subject: [PATCH] fix: remove old LV_OBJ_PART related defines fix #1927 --- src/lv_core/lv_obj.c | 2 +- src/lv_core/lv_obj.h | 4 +--- src/lv_core/lv_obj_style.c | 18 ++++-------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index dc0db2d8c..e413edcb7 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -727,7 +727,7 @@ void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state) if(cmp_res == _LV_STYLE_STATE_CMP_SAME) return; uint8_t part; - for(part = 0; part < _LV_OBJ_PART_REAL_FIRST; part++) { + for(part = 0; part < _LV_OBJ_PART_MAX; part++) { lv_style_list_t * style_list = _lv_obj_get_style_list(obj, part); if(style_list == NULL) break; /*No more style lists*/ if(style_list->ignore_trans) continue; diff --git a/src/lv_core/lv_obj.h b/src/lv_core/lv_obj.h index 020de0281..4739d6869 100644 --- a/src/lv_core/lv_obj.h +++ b/src/lv_core/lv_obj.h @@ -44,14 +44,12 @@ extern "C" { #endif #define LV_MAX_ANCESTOR_NUM 8 +#define _LV_OBJ_PART_MAX 128 #define LV_EXT_CLICK_AREA_OFF 0 #define LV_EXT_CLICK_AREA_TINY 1 #define LV_EXT_CLICK_AREA_FULL 2 -#define _LV_OBJ_PART_VIRTUAL_FIRST 0x01 -#define _LV_OBJ_PART_REAL_FIRST 0x40 - /********************** * TYPEDEFS **********************/ diff --git a/src/lv_core/lv_obj_style.c b/src/lv_core/lv_obj_style.c index 3e42365da..41b0cfd81 100644 --- a/src/lv_core/lv_obj_style.c +++ b/src/lv_core/lv_obj_style.c @@ -289,12 +289,7 @@ void _lv_obj_disable_style_caching(lv_obj_t * obj, bool dis) { #if LV_STYLE_CACHE_LEVEL >= 1 uint8_t part; - for(part = 0; part < _LV_OBJ_PART_REAL_FIRST; part++) { - lv_style_list_t * list = _lv_obj_get_style_list(obj, part); - if(list == NULL) break; - list->ignore_cache = dis; - } - for(part = _LV_OBJ_PART_REAL_FIRST; part < 0xFF; part++) { + for(part = 0; part < _LV_OBJ_PART_MAX; part++) { lv_style_list_t * list = _lv_obj_get_style_list(obj, part); if(list == NULL) break; list->ignore_cache = dis; @@ -324,12 +319,7 @@ void _lv_obj_invalidate_style_cache(lv_obj_t * obj, uint8_t part, lv_style_prope } else { - for(part = 0; part < _LV_OBJ_PART_REAL_FIRST; part++) { - lv_style_list_t * list = _lv_obj_get_style_list(obj, part); - if(list == NULL) break; - list->valid_cache = 0; - } - for(part = _LV_OBJ_PART_REAL_FIRST; part < 0xFF; part++) { + for(part = 0; part < _LV_OBJ_PART_MAX; part++) { lv_style_list_t * list = _lv_obj_get_style_list(obj, part); if(list == NULL) break; list->valid_cache = 0; @@ -1071,7 +1061,7 @@ _lv_style_state_cmp_t _lv_obj_style_state_compare(lv_obj_t * obj, lv_state_t sta { _lv_style_state_cmp_t res = _LV_STYLE_STATE_CMP_SAME; uint8_t part; - for(part = 0; part < _LV_OBJ_PART_REAL_FIRST; part++) { + for(part = 0; part < _LV_OBJ_PART_MAX; part++) { lv_style_list_t * style_list = _lv_obj_get_style_list(obj, part); if(style_list == NULL) break; /*No more style lists*/ @@ -1511,7 +1501,7 @@ static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop) static void update_style_cache_children(lv_obj_t * obj) { uint8_t part; - for(part = 0; part < _LV_OBJ_PART_SPACIAL_START; part++) { + for(part = 0; part < _LV_OBJ_PART_MAX; part++) { lv_style_list_t * list = _lv_obj_get_style_list(obj, part); if(list == NULL) break;