From f259b56e67c7d2f975143bb5faf5fb2538c0187c Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sat, 20 Oct 2018 00:43:42 +0200 Subject: [PATCH] LV_GROUP_KEY_BACKSPACE --- lv_core/lv_group.h | 1 + lv_objx/lv_ta.c | 7 ++++++- lvgl.h | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lv_core/lv_group.h b/lv_core/lv_group.h index 2efd023ed..833651ae0 100644 --- a/lv_core/lv_group.h +++ b/lv_core/lv_group.h @@ -32,6 +32,7 @@ extern "C" { #define LV_GROUP_KEY_LEFT 20 /*0x14*/ #define LV_GROUP_KEY_ESC 27 /*0x1B*/ #define LV_GROUP_KEY_DEL 28 /*0x1C*/ +#define LV_GROUP_KEY_BACKSPACE 29 /*0x1D*/ #define LV_GROUP_KEY_ENTER 10 /*0x0A, '\n'*/ #define LV_GROUP_KEY_NEXT 9 /*0x09, '\t'*/ #define LV_GROUP_KEY_PREV 11 /*0x0B, '*/ diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c index 97f957e87..2ed6e5fef 100644 --- a/lv_objx/lv_ta.c +++ b/lv_objx/lv_ta.c @@ -1087,7 +1087,12 @@ static lv_res_t lv_ta_signal(lv_obj_t * ta, lv_signal_t sign, void * param) else if(c == LV_GROUP_KEY_LEFT) lv_ta_cursor_left(ta); else if(c == LV_GROUP_KEY_UP) lv_ta_cursor_up(ta); else if(c == LV_GROUP_KEY_DOWN) lv_ta_cursor_down(ta); - else if(c == LV_GROUP_KEY_DEL) lv_ta_del_char(ta); + else if(c == LV_GROUP_KEY_BACKSPACE) lv_ta_del_char(ta); + else if(c == LV_GROUP_KEY_DEL) { + uint16_t cp = lv_ta_get_cursor_pos(ta); + lv_ta_set_cursor_pos(ta, cp + 1); + if(cp != lv_ta_get_cursor_pos(ta)) lv_ta_del_char(ta); + } else { lv_ta_add_char(ta, c); } diff --git a/lvgl.h b/lvgl.h index 6e74d53fa..c7214773c 100644 --- a/lvgl.h +++ b/lvgl.h @@ -61,9 +61,9 @@ extern "C" { *********************/ /*Current version of LittlevGL*/ #define LVGL_VERSION_MAJOR 5 -#define LVGL_VERSION_MINOR 2 +#define LVGL_VERSION_MINOR 3 #define LVGL_VERSION_PATCH 0 -#define LVGL_VERSION_INFO "rc" +#define LVGL_VERSION_INFO "dev" /********************** * TYPEDEFS