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

fix(ime):Fix the issue of not clearing pinyin after selecting Chinese characters in K9 mode (#4808)

Browse Source
This commit is contained in:
lhdjply
2023-11-15 20:31:02 +08:00
committed by GitHub
parent 5ad2831f2e
commit 0488c157d7
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/others/ime/lv_ime_pinyin.c
View File

@@ -923,6 +923,7 @@ static char * pinyin_search_matching(lv_obj_t * obj, char * py_str, uint16_t * c
if(*py_str == 'i') return NULL;
if(*py_str == 'u') return NULL;
if(*py_str == 'v') return NULL;
if(*py_str == ' ') return NULL;
offset = py_str[0] - 'a';
len = lv_strlen(py_str);
@@ -964,6 +965,7 @@ static void pinyin_ime_clear_data(lv_obj_t * obj)
}
lv_strcpy(lv_pinyin_k9_cand_str[LV_IME_PINYIN_K9_CAND_TEXT_NUM], LV_SYMBOL_RIGHT"\0");
lv_strcpy(lv_pinyin_k9_cand_str[LV_IME_PINYIN_K9_CAND_TEXT_NUM + 1], "\0");
lv_buttonmatrix_set_map(pinyin_ime->kb, (const char **)lv_btnm_def_pinyin_k9_map);
}
#endif
@@ -999,14 +1001,15 @@ static void pinyin_k9_init_data(lv_obj_t * obj)
py_str_i++;
}
default_kb_ctrl_k9_map[0] = LV_KEYBOARD_CTRL_BUTTON_FLAGS | 1;
default_kb_ctrl_k9_map[4] = LV_KEYBOARD_CTRL_BUTTON_FLAGS | 1;
default_kb_ctrl_k9_map[5] = LV_KEYBOARD_CTRL_BUTTON_FLAGS | 1;
default_kb_ctrl_k9_map[0] = LV_BUTTONMATRIX_CTRL_CHECKED | 1;
default_kb_ctrl_k9_map[1] = LV_BUTTONMATRIX_CTRL_NO_REPEAT | LV_BUTTONMATRIX_CTRL_CLICK_TRIG | 1;
default_kb_ctrl_k9_map[4] = LV_BUTTONMATRIX_CTRL_CHECKED | 1;
default_kb_ctrl_k9_map[5] = LV_BUTTONMATRIX_CTRL_CHECKED | 1;
default_kb_ctrl_k9_map[9] = LV_KEYBOARD_CTRL_BUTTON_FLAGS | 1;
default_kb_ctrl_k9_map[10] = LV_KEYBOARD_CTRL_BUTTON_FLAGS | 1;
default_kb_ctrl_k9_map[14] = LV_KEYBOARD_CTRL_BUTTON_FLAGS | 1;
default_kb_ctrl_k9_map[15] = LV_KEYBOARD_CTRL_BUTTON_FLAGS | 1;
default_kb_ctrl_k9_map[LV_IME_PINYIN_K9_CAND_TEXT_NUM + 16] = LV_KEYBOARD_CTRL_BUTTON_FLAGS | 1;
default_kb_ctrl_k9_map[10] = LV_BUTTONMATRIX_CTRL_CHECKED | 1;
default_kb_ctrl_k9_map[14] = LV_BUTTONMATRIX_CTRL_CHECKED | 1;
default_kb_ctrl_k9_map[15] = LV_BUTTONMATRIX_CTRL_CHECKED | 1;
default_kb_ctrl_k9_map[LV_IME_PINYIN_K9_CAND_TEXT_NUM + 16] = LV_BUTTONMATRIX_CTRL_CHECKED | 1;
}
static void pinyin_k9_get_legal_py(lv_obj_t * obj, char * k9_input, const char * py9_map[])
@@ -1120,14 +1123,16 @@ static void pinyin_k9_fill_cand(lv_obj_t * obj)
ll_index = _lv_ll_get_head(&pinyin_ime->k9_legal_py_ll);
lv_strcpy(pinyin_ime->input_char, ll_index->py_str);
for(uint8_t i = 0; i < LV_IME_PINYIN_K9_CAND_TEXT_NUM; i++) {
lv_strcpy(lv_pinyin_k9_cand_str[i], " ");
}
while(ll_index) {
if(index >= LV_IME_PINYIN_K9_CAND_TEXT_NUM)
break;
if(index >= pinyin_ime->k9_legal_py_count) {
lv_strcpy(lv_pinyin_k9_cand_str[index], " ");
}
else {
if(index < pinyin_ime->k9_legal_py_count) {
lv_strcpy(lv_pinyin_k9_cand_str[index], ll_index->py_str);
}
@@ -1171,6 +1176,10 @@ static void pinyin_k9_cand_page_proc(lv_obj_t * obj, uint16_t dir)
// next page
if(dir == 1) {
for(uint8_t i = 0; i < LV_IME_PINYIN_K9_CAND_TEXT_NUM; i++) {
lv_strcpy(lv_pinyin_k9_cand_str[i], " ");
}
count = 0;
while(ll_index) {
if(count >= (LV_IME_PINYIN_K9_CAND_TEXT_NUM - 1))
@@ -1185,6 +1194,9 @@ static void pinyin_k9_cand_page_proc(lv_obj_t * obj, uint16_t dir)
}
// previous page
else {
for(uint8_t i = 0; i < LV_IME_PINYIN_K9_CAND_TEXT_NUM; i++) {
lv_strcpy(lv_pinyin_k9_cand_str[i], " ");
}
count = LV_IME_PINYIN_K9_CAND_TEXT_NUM - 1;
ll_index = _lv_ll_get_prev(&pinyin_ime->k9_legal_py_ll, ll_index);
while(ll_index) {