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

Merge branch 'beta' into dev-5.2

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-07-08 01:01:05 +02:00
parent 2c1255ffb6 bcab0ffcc6
commit a23a6f7c90
6 changed files with 86 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lv_objx/lv_tabview.c
View File

@@ -255,7 +255,7 @@ void lv_tabview_set_tab_act(lv_obj_t * tabview, uint16_t id, bool anim_en)
lv_style_t * style = lv_obj_get_style(ext->content);
if(id >= ext->tab_cnt) id = ext->tab_cnt - 1;
if(ext->tab_load_action) ext->tab_load_action(tabview, id);
if(ext->tab_load_action && id != ext->tab_cur) ext->tab_load_action(tabview, id);
ext->tab_cur = id;
@@ -723,7 +723,7 @@ static void tabpage_press_lost_handler(lv_obj_t * tabview, lv_obj_t * tabpage)
if(tab_cur < ext->tab_cnt - 1) tab_cur++;
}
if(tab_cur != ext->tab_cur) lv_tabview_set_tab_act(tabview, tab_cur, true);
lv_tabview_set_tab_act(tabview, tab_cur, true);
}
/**