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

Merge pull request #136 from chenshijianworkgit/beta

Browse Source 
fix keyboard cursor management invalid
This commit is contained in:
Gabor Kiss-Vamosi
2018-03-02 10:59:43 +01:00
committed by GitHub
parent 7da60e219d 505c44a4d3
commit 9e20b3a18e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lv_objx/lv_kb.c
View File

@@ -1,7 +1,7 @@
/** /**
* @file lv_kb.c * @file lv_kb.c
* *
*/ */
/********************* /*********************
@@ -80,7 +80,7 @@ lv_obj_t * lv_kb_create(lv_obj_t * par, lv_obj_t * copy)
lv_obj_t * new_kb = lv_btnm_create(par, copy); lv_obj_t * new_kb = lv_btnm_create(par, copy);
lv_mem_assert(new_kb); lv_mem_assert(new_kb);
if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_kb); if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_kb);
/*Allocate the keyboard type specific extended data*/ /*Allocate the keyboard type specific extended data*/
lv_kb_ext_t * ext = lv_obj_allocate_ext_attr(new_kb, sizeof(lv_kb_ext_t)); lv_kb_ext_t * ext = lv_obj_allocate_ext_attr(new_kb, sizeof(lv_kb_ext_t));
lv_mem_assert(ext); lv_mem_assert(ext);
@@ -128,7 +128,7 @@ lv_obj_t * lv_kb_create(lv_obj_t * par, lv_obj_t * copy)
/*Refresh the style with new signal function*/ /*Refresh the style with new signal function*/
lv_obj_refresh_style(new_kb); lv_obj_refresh_style(new_kb);
} }
return new_kb; return new_kb;
} }
@@ -186,7 +186,12 @@ void lv_kb_set_cursor_manage(lv_obj_t * kb, bool en)
if(ext->ta) { if(ext->ta) {
lv_cursor_type_t cur_type; lv_cursor_type_t cur_type;
cur_type = lv_ta_get_cursor_type(ext->ta); cur_type = lv_ta_get_cursor_type(ext->ta);
lv_ta_set_cursor_type(ext->ta, cur_type & (~LV_CURSOR_HIDDEN));
if(ext->cursor_mng){
lv_ta_set_cursor_type(ext->ta, cur_type & (~LV_CURSOR_HIDDEN));
}else{
lv_ta_set_cursor_type(ext->ta, cur_type | LV_CURSOR_HIDDEN);
}
} }
} }