Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

fix(page): fix LV_SCOLLBAR_MODE_DRAG

Browse Source 
fixes
https://forum.lvgl.io/t/page-scrollbar-appears-even-if-scrollbar-mode-is-set-to-lv-scrlbar-mode-drag/3883
This commit is contained in:
Gabor Kiss-Vamosi 2020-12-09 14:02:28 +01:00
parent b80f1dbf14
commit 99bb4cb8f1
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
### Bugfixes ### Bugfixes
- fix(lv_scr_load_anim) fix when multiple screen are loaded at tsame time with delay - fix(lv_scr_load_anim) fix when multiple screen are loaded at tsame time with delay
- fix(page) fix LV_SCOLLBAR_MODE_DRAG
## v7.8.0 (01.12.2020) ## v7.8.0 (01.12.2020)

36
src/lv_widgets/lv_page.c
View File

@ -1250,8 +1250,22 @@ static void scrlbar_refresh(lv_obj_t * page)
(scrl_w + bg_left + bg_right - obj_w), (scrl_w + bg_left + bg_right - obj_w),
obj_h - sb_width - sb_bottom); obj_h - sb_width - sb_bottom);
if(ext->scrlbar.mode == LV_SCROLLBAR_MODE_AUTO || if(ext->scrlbar.mode == LV_SCROLLBAR_MODE_AUTO) ext->scrlbar.hor_draw = 1;
ext->scrlbar.mode == LV_SCROLLBAR_MODE_DRAG) ext->scrlbar.hor_draw = 1; else if(ext->scrlbar.mode == LV_SCROLLBAR_MODE_DRAG) {
lv_indev_t * indev = lv_indev_get_next(NULL);
while(indev) {
if(indev->driver.type == LV_INDEV_TYPE_POINTER && (indev->proc.types.pointer.drag_dir & LV_DRAG_DIR_HOR)) {
lv_obj_t * drag_obj = indev->proc.types.pointer.act_obj;
while(drag_obj && drag_obj->drag_parent) drag_obj = lv_obj_get_parent(drag_obj);
if(drag_obj && drag_obj == scrl) {
ext->scrlbar.hor_draw = 1;
break;
}
}
indev = lv_indev_get_next(indev);
}
}
} }
/*Full sized vertical scroll bar*/ /*Full sized vertical scroll bar*/
@ -1275,8 +1289,22 @@ static void scrlbar_refresh(lv_obj_t * page)
(obj_h - size_tmp - 2 * sb_ver_pad)) / (obj_h - size_tmp - 2 * sb_ver_pad)) /
(scrl_h + bg_top + bg_bottom - obj_h)); (scrl_h + bg_top + bg_bottom - obj_h));
if(ext->scrlbar.mode == LV_SCROLLBAR_MODE_AUTO || if(ext->scrlbar.mode == LV_SCROLLBAR_MODE_AUTO) ext->scrlbar.ver_draw = 1;
ext->scrlbar.mode == LV_SCROLLBAR_MODE_DRAG) ext->scrlbar.ver_draw = 1; else if(ext->scrlbar.mode == LV_SCROLLBAR_MODE_DRAG) {
lv_indev_t * indev = lv_indev_get_next(NULL);
while(indev) {
if(indev->driver.type == LV_INDEV_TYPE_POINTER && (indev->proc.types.pointer.drag_dir & LV_DRAG_DIR_VER)) {
lv_obj_t * drag_obj = indev->proc.types.pointer.act_obj;
while(drag_obj && drag_obj->drag_parent) drag_obj = lv_obj_get_parent(drag_obj);
if(drag_obj && drag_obj == scrl) {
ext->scrlbar.ver_draw = 1;
break;
}
}
indev = lv_indev_get_next(indev);
}
}
} }
/*Invalidate the new scrollbar areas*/ /*Invalidate the new scrollbar areas*/