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

perform style change check in lv_obj_set_state() with LV_USE_ANIMATION == 0 too

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-09-14 20:41:49 +02:00
parent f4cdea6a0d
commit 59791a8e2f
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lv_core/lv_obj.c
View File

@@ -142,10 +142,8 @@ static void obj_del_core(lv_obj_t * obj);
static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop); 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); static void update_style_cache_children(lv_obj_t * obj);
static void invalidate_style_cache(lv_obj_t * obj, uint8_t part, lv_style_property_t prop); static void invalidate_style_cache(lv_obj_t * obj, uint8_t part, lv_style_property_t prop);
#if LV_USE_ANIMATION
static void style_snapshot(lv_obj_t * obj, uint8_t part, style_snapshot_t * shot); static void style_snapshot(lv_obj_t * obj, uint8_t part, style_snapshot_t * shot);
static style_snapshot_res_t style_snapshot_compare(style_snapshot_t * shot1, style_snapshot_t * shot2); static style_snapshot_res_t style_snapshot_compare(style_snapshot_t * shot1, style_snapshot_t * shot2);
#endif
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
@@ -1706,10 +1704,6 @@ void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state)
LV_ASSERT_OBJ(obj, LV_OBJX_NAME); LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
#if LV_USE_ANIMATION == 0
obj->state = new_state;
lv_obj_refresh_style(obj, LV_OBJ_PART_ALL, LV_STYLE_PROP_ALL);
#else
lv_state_t prev_state = obj->state; lv_state_t prev_state = obj->state;
style_snapshot_res_t cmp_res = STYLE_COMPARE_SAME; style_snapshot_res_t cmp_res = STYLE_COMPARE_SAME;
uint8_t part; uint8_t part;
@@ -1733,8 +1727,15 @@ void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state)
} }
} }
obj->state = new_state;
if(cmp_res == STYLE_COMPARE_SAME) return; if(cmp_res == STYLE_COMPARE_SAME) return;
#if LV_USE_ANIMATION == 0
if(cmp_res == STYLE_COMPARE_DIFF) lv_obj_refresh_style(obj, part, LV_STYLE_PROP_ALL);
else if(cmp_res == STYLE_COMPARE_VISUAL_DIFF) lv_obj_refresh_style(obj, LV_OBJ_PART_ALL, LV_STYLE_PROP_ALL);
#else
for(part = 0; part < _LV_OBJ_PART_REAL_LAST; part++) { for(part = 0; part < _LV_OBJ_PART_REAL_LAST; part++) {
lv_style_list_t * style_list = lv_obj_get_style_list(obj, 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 == NULL) break; /*No more style lists*/
@@ -4734,7 +4735,6 @@ static void invalidate_style_cache(lv_obj_t * obj, uint8_t part, lv_style_proper
} }
} }
#if LV_USE_ANIMATION
static void style_snapshot(lv_obj_t * obj, uint8_t part, style_snapshot_t * shot) static void style_snapshot(lv_obj_t * obj, uint8_t part, style_snapshot_t * shot)
{ {
_lv_obj_disable_style_caching(obj, true); _lv_obj_disable_style_caching(obj, true);
@@ -4810,4 +4810,3 @@ static style_snapshot_res_t style_snapshot_compare(style_snapshot_t * shot1, sty
/*If not returned earlier its just a visual difference, a simple redraw is enough*/ /*If not returned earlier its just a visual difference, a simple redraw is enough*/
return STYLE_COMPARE_VISUAL_DIFF; return STYLE_COMPARE_VISUAL_DIFF;
} }
#endif