Merge branch 'dev'

This commit is contained in:
Gabor Kiss-Vamosi
2020-06-16 13:56:42 +02:00
21 changed files with 713 additions and 183 deletions

View File

@@ -176,6 +176,15 @@ static inline lv_obj_t * lv_page_get_scrl(lv_obj_t * page)
}
#endif
#if LV_USE_WIN
static inline lv_obj_t * lv_win_add_btn(lv_obj_t * win, const void * img_src)
{
return lv_win_add_btn_right(win, img_src);
}
#endif
#endif /*LV_USE_API_EXTENSION_V6*/
/**********************