Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-30 07:06:19 +08:00
Code Issues Actions 123 Packages Projects Releases Wiki Activity

fix(scrollbar) hide the scrollbar if the scrollble flag is removed

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-09-30 18:20:35 +02:00
parent 188a9467b1
commit d9c6ad0425
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/lv_obj.c
+2 -4
View File
@@ -226,7 +226,6 @@ void lv_obj_add_flag(lv_obj_t * obj, lv_obj_flag_t f)
LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_OBJ(obj, MY_CLASS);
bool was_on_layout = lv_obj_is_layout_positioned(obj); bool was_on_layout = lv_obj_is_layout_positioned(obj);
bool scrollable_chg = (f & LV_OBJ_FLAG_SCROLLABLE) != (obj->flags & LV_OBJ_FLAG_SCROLLABLE);
if(f & LV_OBJ_FLAG_HIDDEN) lv_obj_invalidate(obj); if(f & LV_OBJ_FLAG_HIDDEN) lv_obj_invalidate(obj);
@@ -240,7 +239,7 @@ void lv_obj_add_flag(lv_obj_t * obj, lv_obj_flag_t f)
lv_obj_mark_layout_as_dirty(lv_obj_get_parent(obj)); lv_obj_mark_layout_as_dirty(lv_obj_get_parent(obj));
} }
if(scrollable_chg) { if(f & LV_OBJ_FLAG_SCROLLABLE) {
lv_area_t hor_area, ver_area; lv_area_t hor_area, ver_area;
lv_obj_get_scrollbar_area(obj, &hor_area, &ver_area); lv_obj_get_scrollbar_area(obj, &hor_area, &ver_area);
lv_obj_invalidate_area(obj, &hor_area); lv_obj_invalidate_area(obj, &hor_area);
@@ -253,8 +252,7 @@ void lv_obj_clear_flag(lv_obj_t * obj, lv_obj_flag_t f)
LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_OBJ(obj, MY_CLASS);
bool was_on_layout = lv_obj_is_layout_positioned(obj); bool was_on_layout = lv_obj_is_layout_positioned(obj);
bool scrollable_chg = (f & LV_OBJ_FLAG_SCROLLABLE) != (obj->flags & LV_OBJ_FLAG_SCROLLABLE); if(f & LV_OBJ_FLAG_SCROLLABLE) {
if(scrollable_chg) {
lv_area_t hor_area, ver_area; lv_area_t hor_area, ver_area;
lv_obj_get_scrollbar_area(obj, &hor_area, &ver_area); lv_obj_get_scrollbar_area(obj, &hor_area, &ver_area);
lv_obj_invalidate_area(obj, &hor_area); lv_obj_invalidate_area(obj, &hor_area);