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

Merge branch 'new_tabview_scroll' of github.com:littlevgl/lvgl into new_tabview_scroll

Browse Source
This commit is contained in:
Themba Dube
2019-03-22 21:27:01 -04:00
parent e1f9462818 13033c28d8
commit 25539b6606
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_objx/lv_page.c
View File

@@ -949,7 +949,7 @@ static lv_res_t lv_page_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, voi
}
}
else if(scrl_coords.x1 > page_coords.x1 + page_style->body.padding.left) {
new_x = hpad; /*Left align*/
new_x = page_style->body.padding.left; /*Left align*/
refr_x = true;
if(page_ext->edge_flash.enabled &&
page_ext->edge_flash.left_ip == 0 && page_ext->edge_flash.right_ip == 0 &&
@@ -960,7 +960,7 @@ static lv_res_t lv_page_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, voi
}
}
/*scrollable height smaller then page height? -> align to left*/
/*scrollable height smaller then page height? -> align to top*/
if(lv_area_get_height(&scrl_coords) + vpad <= lv_area_get_height(&page_coords)) {
if(scrl_coords.y1 != page_coords.y1 + page_style->body.padding.top) {
new_y = page_style->body.padding.top;