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

fix(indev): skip press event on new object release (#7612)

Browse Source
This commit is contained in:
André Costa
2025-01-30 17:14:07 +01:00
committed by GitHub
parent 2579d2bfe7
commit c4e426ab6b
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/indev/lv_indev.c
View File

@@ -742,6 +742,7 @@ static void indev_pointer_proc(lv_indev_t * i, lv_indev_data_t * data)
indev_proc_release(i);
}
i->prev_state = i->state;
i->pointer.last_point.x = i->pointer.act_point.x;
i->pointer.last_point.y = i->pointer.act_point.y;
}
@@ -1158,8 +1159,14 @@ static void indev_button_proc(lv_indev_t * i, lv_indev_data_t * data)
i->pointer.act_point.x = x;
i->pointer.act_point.y = y;
if(data->state == LV_INDEV_STATE_PRESSED) indev_proc_press(i);
else indev_proc_release(i);
if(data->state == LV_INDEV_STATE_PRESSED) {
indev_proc_press(i);
}
else {
indev_proc_release(i);
}
i->prev_state = i->state;
if(indev_reset_check(i)) return;
@@ -1210,6 +1217,7 @@ static void indev_proc_press(lv_indev_t * indev)
if(indev_obj_act != indev->pointer.act_obj) {
indev->pointer.last_point.x = indev->pointer.act_point.x;
indev->pointer.last_point.y = indev->pointer.act_point.y;
indev->pointer.pressed = indev->prev_state == LV_INDEV_STATE_RELEASED;
/*Without `LV_OBJ_FLAG_PRESS_LOCK` new widget can be found while pressing.*/
if(indev->pointer.last_hovered && indev->pointer.last_hovered != indev_obj_act) {
@@ -1251,12 +1259,19 @@ static void indev_proc_press(lv_indev_t * indev)
indev->pointer.vect.x = 0;
indev->pointer.vect.y = 0;
const bool is_enabled = !lv_obj_has_state(indev_obj_act, LV_STATE_DISABLED);
if(is_enabled) {
if(indev->pointer.last_hovered != indev_obj_act) {
if(send_event(LV_EVENT_HOVER_OVER, indev_act) == LV_RESULT_INVALID) return;
/* If the indev was already in a pressed state it means that we got dragged here
* so we shouldn't send any hover nor pressed events for a new object since the
* originally pressed object didn't get released
*/
if(indev->prev_state != LV_INDEV_STATE_PRESSED) {
const bool is_enabled = !lv_obj_has_state(indev_obj_act, LV_STATE_DISABLED);
if(is_enabled) {
if(indev->pointer.last_hovered != indev_obj_act) {
if(send_event(LV_EVENT_HOVER_OVER, indev_act) == LV_RESULT_INVALID) return;
}
if(send_event(LV_EVENT_PRESSED, indev_act) == LV_RESULT_INVALID) return;
}
if(send_event(LV_EVENT_PRESSED, indev_act) == LV_RESULT_INVALID) return;
}
if(indev_act->wait_until_release) return;
@@ -1402,10 +1417,12 @@ static void indev_proc_release(lv_indev_t * indev)
if(is_enabled) {
if(scroll_obj == NULL) {
if(indev->long_pr_sent == 0) {
if(indev_proc_short_click(indev) == LV_RESULT_INVALID) return;
if(indev->pointer.pressed) {
if(indev->long_pr_sent == 0) {
if(indev_proc_short_click(indev) == LV_RESULT_INVALID) return;
}
if(send_event(LV_EVENT_CLICKED, indev_act) == LV_RESULT_INVALID) return;
}
if(send_event(LV_EVENT_CLICKED, indev_act) == LV_RESULT_INVALID) return;
}
else {
lv_obj_send_event(scroll_obj, LV_EVENT_SCROLL_THROW_BEGIN, indev_act);

2
src/indev/lv_indev_private.h
View File

@@ -33,6 +33,7 @@ struct _lv_indev_t {
lv_indev_read_cb_t read_cb;
lv_indev_state_t state; /**< Current state of the input device.*/
lv_indev_state_t prev_state; /**< Previous state of the input device.*/
lv_indev_mode_t mode;
/*Flags*/
@@ -101,6 +102,7 @@ struct _lv_indev_t {
uint8_t gesture_dir : 4;
uint8_t gesture_sent : 1;
uint8_t press_moved : 1;
uint8_t pressed : 1;
} pointer;
struct {
/*Keypad data*/