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

lv_kb: bugfix update

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-12-15 00:11:28 +01:00
committed by Themba Dube
parent c74f4656fc
commit 52ffa29ebe
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lv_objx/lv_kb.c
View File

@@ -419,20 +419,18 @@ static lv_res_t lv_kb_def_action(lv_obj_t * kb, const char * txt)
lv_kb_set_ta(kb, NULL); /*De-assign the text area to hide it cursor if needed*/ lv_kb_set_ta(kb, NULL); /*De-assign the text area to hide it cursor if needed*/
lv_obj_del(kb); lv_obj_del(kb);
} }
return LV_RES_INV; return res;
} else if(strcmp(txt, SYMBOL_OK) == 0) { } else if(strcmp(txt, SYMBOL_OK) == 0) {
if(ext->ok_action) res = ext->ok_action(kb); if(ext->ok_action) res = ext->ok_action(kb);
else { else {
lv_kb_set_ta(kb, NULL); /*De-assign the text area to hide it cursor if needed*/ lv_kb_set_ta(kb, NULL); /*De-assign the text area to hide it cursor if needed*/
res = lv_obj_del(kb); res = lv_obj_del(kb);
} }
return res;
} }
if(res != LV_RES_OK) return res; /*The keyboard might be deleted in the actions*/ if(res != LV_RES_OK) return res; /*The keyboard might be deleted in the actions*/
/*If it's the OK or Close button do nothing */
if((strcmp(txt, SYMBOL_OK) == 0) || (strcmp(txt, SYMBOL_CLOSE) == 0)) return LV_RES_OK;
/*Add the characters to the text area if set*/ /*Add the characters to the text area if set*/
if(ext->ta == NULL) return res; if(ext->ta == NULL) return res;