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

fix keypad event might be generated multiple times if the event handler returns LV_RES_INV

Browse Source
This commit is contained in:
manison
2019-03-22 08:46:06 +01:00
parent 0005f4c88e
commit f972eb54aa
1 changed files with 85 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/lv_core/lv_indev.c
View File

@@ -402,6 +402,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
* It must be done here else `lv_indev_get_key` will return the last key in events and signals*/
i->proc.types.keypad.last_key = data->key;
do {
/*Key press happened*/
if (data->state == LV_INDEV_STATE_PR &&
i->proc.types.keypad.last_state == LV_INDEV_STATE_REL)
@@ -411,9 +412,9 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
/*Simulate a press on the object if ENTER was pressed*/
if (data->key == LV_GROUP_KEY_ENTER) {
focused->signal_cb(focused, LV_SIGNAL_PRESSED, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
lv_event_send(focused, LV_EVENT_PRESSED, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
/*Send the ENTER as a normal KEY*/
lv_group_send_data(g, LV_GROUP_KEY_ENTER);
@@ -422,13 +423,13 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
else if (data->key == LV_GROUP_KEY_NEXT) {
lv_group_set_editing(g, false); /*Editing is not used by KEYPAD is be sure it is disabled*/
lv_group_focus_next(g);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
}
/*Move the focus on PREV*/
else if (data->key == LV_GROUP_KEY_PREV) {
lv_group_set_editing(g, false); /*Editing is not used by KEYPAD is be sure it is disabled*/
lv_group_focus_prev(g);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
}
/*Just send other keys to the object (e.g. 'A' or `LV_GORUP_KEY_RIGHT)*/
else {
@@ -444,9 +445,9 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
if (data->key == LV_GROUP_KEY_ENTER) {
i->proc.longpr_rep_timestamp = lv_tick_get();
focused->signal_cb(focused, LV_SIGNAL_LONG_PRESS, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
lv_event_send(focused, LV_EVENT_LONG_PRESSED, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
}
}
/*Long press repeated time has elapsed?*/
@@ -457,26 +458,26 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
/*Send LONG_PRESS_REP on ENTER*/
if (data->key == LV_GROUP_KEY_ENTER) {
focused->signal_cb(focused, LV_SIGNAL_LONG_PRESS_REP, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
lv_event_send(focused, LV_EVENT_LONG_PRESSED_REPEAT, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
}
/*Move the focus on NEXT again*/
else if (data->key == LV_GROUP_KEY_NEXT) {
lv_group_set_editing(g, false); /*Editing is not used by KEYPAD is be sure it is disabled*/
lv_group_focus_next(g);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
}
/*Move the focus on PREV again*/
else if (data->key == LV_GROUP_KEY_PREV) {
lv_group_set_editing(g, false); /*Editing is not used by KEYPAD is be sure it is disabled*/
lv_group_focus_prev(g);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
}
/*Just send other keys again to the object (e.g. 'A' or `LV_GORUP_KEY_RIGHT)*/
else {
lv_group_send_data(g, data->key);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
}
}
}
@@ -488,21 +489,22 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
if (data->key == LV_GROUP_KEY_ENTER) {
focused->signal_cb(focused, LV_SIGNAL_RELEASED, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
if (i->proc.long_pr_sent == 0) {
lv_event_send(focused, LV_EVENT_SHORT_CLICKED, NULL);
}
lv_event_send(focused, LV_EVENT_CLICKED, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
lv_event_send(focused, LV_EVENT_RELEASED, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if (i->proc.reset_query) break; /*The object might be deleted*/
}
i->proc.pr_timestamp = 0;
i->proc.long_pr_sent = 0;
}
} while (false);
i->proc.types.keypad.last_state = data->state;
#else