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

merge master

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-09-22 13:57:23 +02:00
parent 33acf23949 64a4fff635
commit a00a293871
67 changed files with 1044 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lv_widgets/lv_dropdown.c
View File

@@ -825,9 +825,7 @@ static lv_design_res_t lv_dropdown_page_design(lv_obj_t * page, const lv_area_t
draw_box(ddlist, &clip_area_core, ext->pr_opt_id, LV_STATE_PRESSED);
}
if(ext->show_selected) {
draw_box(ddlist, &clip_area_core, ext->sel_opt_id, LV_STATE_DEFAULT);
}
draw_box(ddlist, &clip_area_core, ext->sel_opt_id, LV_STATE_DEFAULT);
}
}
}
@@ -853,9 +851,7 @@ static lv_design_res_t lv_dropdown_page_design(lv_obj_t * page, const lv_area_t
draw_box_label(ddlist, &clip_area_core, ext->pr_opt_id, LV_STATE_PRESSED);
}
if(ext->show_selected) {
draw_box_label(ddlist, &clip_area_core, ext->sel_opt_id, LV_STATE_DEFAULT);
}
draw_box_label(ddlist, &clip_area_core, ext->sel_opt_id, LV_STATE_DEFAULT);
}
}
}
@@ -1281,10 +1277,12 @@ static uint16_t get_id_on_point(lv_obj_t * ddlist, lv_coord_t x, lv_coord_t y)
y -= label->coords.y1;
uint32_t letter_i;
const char * txt = lv_label_get_text(label);
lv_point_t p = {x, y};
letter_i = lv_label_get_letter_on(label, &p);
uint32_t letter_i_byte_pos = _lv_txt_encoded_get_byte_id(txt, letter_i);
uint16_t opt = 0;
const char * txt = lv_label_get_text(label);
uint32_t i = 0;
uint32_t i_prev = 0;
@@ -1293,7 +1291,7 @@ static uint16_t get_id_on_point(lv_obj_t * ddlist, lv_coord_t x, lv_coord_t y)
uint32_t letter = _lv_txt_encoded_next(txt, &i);
/*Count the lines to reach the clicked letter. But ignore the last '\n' because it
* still belongs to the clicked line*/
if(letter == '\n' && i_prev != letter_i) opt++;
if(letter == '\n' && i_prev != letter_i_byte_pos) opt++;
i_prev = i;
}