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

Merge pull request #271 from upbeat27/page_focus_fix

Browse Source 
Fix page focus not focusing objects the same way when moving up or down the page
This commit is contained in:
Gabor Kiss-Vamosi 2018-06-12 12:44:17 +02:00 committed by GitHub
commit 3d315a891b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lv_objx/lv_page.c
View File

@ -303,9 +303,9 @@ void lv_page_focus(lv_obj_t * page, lv_obj_t * obj, uint16_t anim_time)
else if((obj_h <= page_h && bot_err > 0) || else if((obj_h <= page_h && bot_err > 0) ||
(obj_h > page_h && top_err >= bot_err)) { (obj_h > page_h && top_err >= bot_err)) {
/*Calculate a new position and let some space below*/ /*Calculate a new position and let some space below*/
scrlable_y = -obj_y; scrlable_y = -(obj_y + style_scrl->body.padding.ver + style->body.padding.ver);
scrlable_y += page_h - obj_h;
scrlable_y -= style_scrl->body.padding.ver; scrlable_y -= style_scrl->body.padding.ver;
scrlable_y += page_h - obj_h;
} else { } else {
/*Already in focus*/ /*Already in focus*/
return; return;