Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-21 06:53:01 +08:00
Code Issues Projects Releases Wiki Activity

Use the max x and y drag diff to control drag

Browse Source
This commit is contained in:
Adam Martini 2020-06-26 08:40:30 -07:00
parent 8bcbceef08
commit 4011d54668
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lv_widgets/lv_rotary.c
View File

@ -403,32 +403,34 @@ static lv_res_t lv_rotary_signal(lv_obj_t * rotary, lv_signal_t sign, void * par
lv_point_t p;
if(sign == LV_SIGNAL_PRESSED) {
lv_indev_get_point(param, &p);
ext->last_drag_x = p.x;
lv_indev_get_point(lv_indev_get_act(), &ext->last_press_point);
ext->dragging = true;
}
else if(sign == LV_SIGNAL_PRESSING) {
lv_indev_get_point(param, &p);
lv_coord_t drag_x_diff = p.x -ext->last_drag_x;
lv_coord_t drag_diff;
lv_coord_t drag_x_diff = p.x -ext->last_press_point.x;
lv_coord_t drag_y_diff = p.y -ext->last_press_point.y;
if (LV_MATH_ABS(drag_x_diff) > ext->threshold) {
if (drag_x_diff > 0) drag_x_diff = ext->threshold;
else drag_x_diff = -ext->threshold;
if (LV_MATH_ABS(drag_x_diff) > LV_MATH_ABS(drag_y_diff)) drag_diff = drag_x_diff;
else drag_diff = drag_y_diff;
if (LV_MATH_ABS(drag_diff) > ext->threshold) {
if (drag_diff > 0) drag_diff = ext->threshold;
else drag_diff = -ext->threshold;
}
ext->last_drag_x = p.x;
if (ext->knob_area.y1 < p.y && p.y < ext->knob_area.y2) {
if (drag_x_diff > 0 && p.x < ext->knob_area.x2) {
if (lv_rotary_set_value(rotary, lv_rotary_get_value(rotary) + drag_x_diff * ext->sensitivity, LV_ANIM_ON)) {
if (drag_diff > 0 && p.x < ext->knob_area.x2) {
if (lv_rotary_set_value(rotary, lv_rotary_get_value(rotary) + drag_diff * ext->sensitivity, LV_ANIM_ON)) {
res = lv_event_send(rotary, LV_EVENT_VALUE_CHANGED, NULL);
if(res != LV_RES_OK) return res;
}
}
else if (drag_x_diff < 0 && p.x > ext->knob_area.x1) {
else if (drag_diff < 0 && p.x > ext->knob_area.x1) {
ext->last_drag_x = p.x;
if (lv_rotary_set_value(rotary, lv_rotary_get_value(rotary) + drag_x_diff * ext->sensitivity, LV_ANIM_ON)) {
if (lv_rotary_set_value(rotary, lv_rotary_get_value(rotary) + drag_diff * ext->sensitivity, LV_ANIM_ON)) {
res = lv_event_send(rotary, LV_EVENT_VALUE_CHANGED, NULL);
if(res != LV_RES_OK) return res;
}

2
src/lv_widgets/lv_rotary.h
View File

@ -72,7 +72,7 @@ typedef struct {
int16_t max_value; /*Maximum value of the rotary*/
int16_t sensitivity; /*Increment multiplier of the rotary*/
int16_t threshold; /*Increment threshold of the rotary*/
lv_coord_t last_drag_x; /*Last drag x coordintate of the rotary*/
lv_point_t last_press_point; /*Last drag point of the rotary*/
uint16_t dragging :1;
} lv_rotary_ext_t;