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

run clang format

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-04-10 06:21:54 +02:00
parent c2653174f5
commit c4f8e5f8be
8 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lv_core/lv_indev.c
View File

@@ -408,14 +408,13 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
focused->signal_cb(focused, LV_SIGNAL_PRESSED, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
lv_event_send(focused, LV_EVENT_PRESSED, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
}
else if(data->key == LV_KEY_ESC) {
if(i->proc.reset_query) return; /*The object might be deleted*/
} else if(data->key == LV_KEY_ESC) {
/*Send the ESC as a normal KEY*/
lv_group_send_data(g, LV_KEY_ESC);
lv_event_send(focused, LV_EVENT_CANCEL, NULL);
if(i->proc.reset_query) return; /*The object might be deleted*/
if(i->proc.reset_query) return; /*The object might be deleted*/
}
/*Move the focus on NEXT*/
else if(data->key == LV_KEY_NEXT) {
@@ -1069,11 +1068,12 @@ static void indev_drag(lv_indev_proc_t * state)
lv_coord_t prev_par_h = lv_obj_get_height(lv_obj_get_parent(drag_obj));
/*Get the coordinates of the object and modify them*/
lv_coord_t act_x = lv_obj_get_x(drag_obj);
lv_coord_t act_y = lv_obj_get_y(drag_obj);
lv_coord_t act_x = lv_obj_get_x(drag_obj);
lv_coord_t act_y = lv_obj_get_y(drag_obj);
if(allowed_dirs == LV_DRAG_DIR_ALL)
lv_obj_set_pos(drag_obj, act_x + state->types.pointer.vect.x, act_y + state->types.pointer.vect.y);
lv_obj_set_pos(drag_obj, act_x + state->types.pointer.vect.x,
act_y + state->types.pointer.vect.y);
else if(allowed_dirs & LV_DRAG_DIR_HOR)
lv_obj_set_x(drag_obj, act_x + state->types.pointer.vect.x);
else if(allowed_dirs & LV_DRAG_DIR_VER)
@@ -1101,7 +1101,6 @@ static void indev_drag(lv_indev_proc_t * state)
new_inv_buf_size - inv_buf_size);
}
}
}
}
}
@@ -1149,11 +1148,11 @@ static void indev_drag_throw(lv_indev_proc_t * proc)
lv_coord_t act_y = lv_obj_get_y(drag_obj) + proc->types.pointer.drag_throw_vect.y;
if(allowed_dirs == LV_DRAG_DIR_ALL)
lv_obj_set_pos(drag_obj, act_x, act_y);
lv_obj_set_pos(drag_obj, act_x, act_y);
else if(allowed_dirs & LV_DRAG_DIR_HOR)
lv_obj_set_x(drag_obj, act_x);
lv_obj_set_x(drag_obj, act_x);
else if(allowed_dirs & LV_DRAG_DIR_VER)
lv_obj_set_y(drag_obj, act_y);
lv_obj_set_y(drag_obj, act_y);
lv_area_t coord_new;
lv_obj_get_coords(drag_obj, &coord_new);