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

merge beta

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-07-30 06:56:31 +02:00
parent 769c7b28ff 818cd278b2
commit c2712963d6
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lv_objx/lv_cont.h
View File

@@ -52,8 +52,9 @@ typedef struct
/*New data for this type */
uint8_t layout :4; /*A layout from 'lv_cont_layout_t' enum*/
uint8_t hor_fit :1; /*1: Enable horizontal fit to involve all children*/
uint8_t ver_fit :1; /*1: Enable horizontal fir to involve all children*/
} lv_cont_ext_t;
uint8_t ver_fit :1; /*1: Enable horizontal fit to involve all children*/
}lv_cont_ext_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_label.c
View File

@@ -512,8 +512,10 @@ uint16_t lv_label_get_letter_on(const lv_obj_t * label, lv_point_t * pos)
/*Search the line of the index letter */;
while(txt[line_start] != '\0') {
new_line_start += lv_txt_get_next_line(&txt[line_start], font, style->text.letter_space, max_w, flag);
if(pos->y <= y + letter_height) break; /*The line is found (stored in 'line_start')*/
y += letter_height + style->text.line_space;
if(pos->y <= y + letter_height) break; /*The line is found (stored in 'line_start')*/
y += letter_height + style->text.line_space;
line_start = new_line_start;
}