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 remote-tracking branch 'origin/master' into dev-5.3

Browse Source
This commit is contained in:
Themba Dube 2018-12-11 07:34:09 -05:00
commit a2a03d8d53
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lv_objx/lv_list.c
View File

@ -447,10 +447,10 @@ lv_obj_t * lv_list_get_btn_img(const lv_obj_t * btn)
}
/**
* Get the next button from list. (Starts from the bottom button)
* Get the previous button from list. (Starts from the top button)
* @param list pointer to a list object
* @param prev_btn pointer to button. Search the next after it.
* @return pointer to the next button or NULL when no more buttons
* @param prev_btn pointer to button. Search the previous before it.
* @return pointer to the previous button or NULL when no more buttons
*/
lv_obj_t * lv_list_get_prev_btn(const lv_obj_t * list, lv_obj_t * prev_btn)
{
@ -472,11 +472,12 @@ lv_obj_t * lv_list_get_prev_btn(const lv_obj_t * list, lv_obj_t * prev_btn)
}
/**
* Get the previous button from list. (Starts from the top button)
/**
* Get the next button from list. (Starts from the bottom button)
* @param list pointer to a list object
* @param prev_btn pointer to button. Search the previous before it.
* @return pointer to the previous button or NULL when no more buttons
* @param prev_btn pointer to button. Search the next after it.
* @return pointer to the next button or NULL when no more buttons
*/
lv_obj_t * lv_list_get_next_btn(const lv_obj_t * list, lv_obj_t * prev_btn)
{

2
lv_themes/lv_theme_alien.c
View File

@ -28,8 +28,6 @@
static uint16_t _hue;
static lv_font_t * _font;
static lv_font_t * _font;
static lv_font_t * _font;
static lv_theme_t theme;
static lv_style_t def;

4
lv_themes/lv_theme_mono.c
View File

@ -36,7 +36,6 @@ static lv_style_t light_frame;
static lv_style_t dark_frame;
/*Saved input parameters*/
static uint16_t _hue;
static lv_font_t * _font;
@ -421,7 +420,7 @@ static void win_init(void)
/**
* Initialize the mono theme
* @param hue [0..360] hue value from HSV color space to define the theme's base color
* @param hue [0..360] hue value from HSV color space to define the theme's base color; is not used in lv_theme_mono
* @param font pointer to a font (NULL to use the default)
* @return pointer to the initialized theme
*/
@ -429,7 +428,6 @@ lv_theme_t * lv_theme_mono_init(uint16_t hue, lv_font_t * font)
{
if(font == NULL) font = LV_FONT_DEFAULT;
_hue = hue;
_font = font;
/*For backward compatibility initialize all theme elements with a default style */