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

rename LV_DROPDOWN_PART_SCRLBAR to LV_DROPDOWN_PART_SCROLLBAR

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-05-11 12:34:03 +02:00
parent d819aa0e4e
commit ba5663d3d3
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_themes/lv_theme_material.c
View File

@@ -1228,8 +1228,8 @@ static void theme_apply(lv_obj_t * obj, lv_theme_style_t name)
lv_style_list_add_style(list, &bg); lv_style_list_add_style(list, &bg);
lv_style_list_add_style(list, &ddlist_page); lv_style_list_add_style(list, &ddlist_page);
lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SCRLBAR); lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SCROLLBAR);
list = lv_obj_get_style_list(obj, LV_DROPDOWN_PART_SCRLBAR); list = lv_obj_get_style_list(obj, LV_DROPDOWN_PART_SCROLLBAR);
lv_style_list_add_style(list, &sb); lv_style_list_add_style(list, &sb);
lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SELECTED); lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SELECTED);

4
src/lv_themes/lv_theme_mono.c
View File

@@ -882,8 +882,8 @@ static void theme_apply(lv_obj_t * obj, lv_theme_style_t name)
lv_style_list_add_style(list, &style_bg); lv_style_list_add_style(list, &style_bg);
lv_style_list_add_style(list, &style_big_line_space); lv_style_list_add_style(list, &style_big_line_space);
lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SCRLBAR); lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SCROLLBAR);
list = lv_obj_get_style_list(obj, LV_DROPDOWN_PART_SCRLBAR); list = lv_obj_get_style_list(obj, LV_DROPDOWN_PART_SCROLLBAR);
lv_style_list_add_style(list, &style_sb); lv_style_list_add_style(list, &style_sb);
lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SELECTED); lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SELECTED);

4
src/lv_themes/lv_theme_template.c
View File

@@ -727,8 +727,8 @@ void theme_apply(lv_obj_t * obj, lv_theme_style_t name)
list = lv_obj_get_style_list(obj, LV_DROPDOWN_PART_LIST); list = lv_obj_get_style_list(obj, LV_DROPDOWN_PART_LIST);
lv_style_list_add_style(list, &style_bg); lv_style_list_add_style(list, &style_bg);
lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SCRLBAR); lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SCROLLBAR);
list = lv_obj_get_style_list(obj, LV_DROPDOWN_PART_SCRLBAR); list = lv_obj_get_style_list(obj, LV_DROPDOWN_PART_SCROLLBAR);
lv_style_list_add_style(list, &style_bg); lv_style_list_add_style(list, &style_bg);
lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SELECTED); lv_obj_clean_style_list(obj, LV_DROPDOWN_PART_SELECTED);

4
src/lv_widgets/lv_dropdown.c
View File

@@ -867,7 +867,7 @@ static lv_res_t lv_dropdown_signal(lv_obj_t * ddlist, lv_signal_t sign, void * p
else if(sign == LV_SIGNAL_GET_STATE_DSC) { else if(sign == LV_SIGNAL_GET_STATE_DSC) {
lv_get_state_info_t * info = param; lv_get_state_info_t * info = param;
if(info->part == LV_DROPDOWN_PART_LIST || if(info->part == LV_DROPDOWN_PART_LIST ||
info->part == LV_DROPDOWN_PART_SCRLBAR || info->part == LV_DROPDOWN_PART_SCROLLBAR ||
info->part == LV_DROPDOWN_PART_SELECTED) { info->part == LV_DROPDOWN_PART_SELECTED) {
info->result = lv_obj_get_state(ext->page, LV_PAGE_PART_BG); info->result = lv_obj_get_state(ext->page, LV_PAGE_PART_BG);
} }
@@ -1085,7 +1085,7 @@ static lv_style_list_t * lv_dropdown_get_style(lv_obj_t * ddlist, uint8_t part)
case LV_DROPDOWN_PART_LIST: case LV_DROPDOWN_PART_LIST:
style_dsc_p = &ext->style_page; style_dsc_p = &ext->style_page;
break; break;
case LV_DROPDOWN_PART_SCRLBAR: case LV_DROPDOWN_PART_SCROLLBAR:
style_dsc_p = &ext->style_scrlbar; style_dsc_p = &ext->style_scrlbar;
break; break;
case LV_DROPDOWN_PART_SELECTED: case LV_DROPDOWN_PART_SELECTED:

2
src/lv_widgets/lv_dropdown.h
View File

@@ -70,7 +70,7 @@ typedef struct {
enum { enum {
LV_DROPDOWN_PART_MAIN = LV_OBJ_PART_MAIN, LV_DROPDOWN_PART_MAIN = LV_OBJ_PART_MAIN,
LV_DROPDOWN_PART_LIST = _LV_OBJ_PART_REAL_LAST, LV_DROPDOWN_PART_LIST = _LV_OBJ_PART_REAL_LAST,
LV_DROPDOWN_PART_SCRLBAR, LV_DROPDOWN_PART_SCROLLBAR,
LV_DROPDOWN_PART_SELECTED, LV_DROPDOWN_PART_SELECTED,
}; };
typedef uint8_t lv_dropdown_part_t; typedef uint8_t lv_dropdown_part_t;