From d4bfeb2bedcd87779b073b8bbea6cfaa68d467b4 Mon Sep 17 00:00:00 2001 From: Brian Pugh Date: Wed, 3 Apr 2019 22:36:10 -0700 Subject: [PATCH 1/4] lv_indev.c have LV_GROUP_KEY_ESC send an LV_EVENT_CANCEL signal --- src/lv_core/lv_indev.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/lv_core/lv_indev.c b/src/lv_core/lv_indev.c index 551a79c02..1bcc831e1 100644 --- a/src/lv_core/lv_indev.c +++ b/src/lv_core/lv_indev.c @@ -415,13 +415,20 @@ 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) { + /*Send the ENTER as a normal KEY*/ + lv_group_send_data(g, LV_GROUP_KEY_ENTER); + 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_GROUP_KEY_ESC) { + /*Send the ESC as a normal KEY*/ + lv_group_send_data(g, LV_GROUP_KEY_ESC); - /*Send the ENTER as a normal KEY*/ - lv_group_send_data(g, LV_GROUP_KEY_ENTER); + lv_event_send(focused, LV_EVENT_CANCEL, NULL); + if(i->proc.reset_query) return; /*The object might be deleted*/ } /*Move the focus on NEXT*/ else if(data->key == LV_GROUP_KEY_NEXT) { @@ -435,7 +442,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) lv_group_focus_prev(g); if(i->proc.reset_query) return; /*The object might be deleted*/ } - /*Just send other keys to the object (e.g. 'A' or `LV_GORUP_KEY_RIGHT)*/ + /*Just send other keys to the object (e.g. 'A' or `LV_GROUP_KEY_RIGHT`)*/ else { lv_group_send_data(g, data->key); } From 912b014b0364a0591916c340a4c94f5fcd49659e Mon Sep 17 00:00:00 2001 From: manison Date: Mon, 18 Mar 2019 11:15:43 +0100 Subject: [PATCH 2/4] fix return value type --- src/lv_draw/lv_draw_img.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c index 85e106be8..9b1849164 100644 --- a/src/lv_draw/lv_draw_img.c +++ b/src/lv_draw/lv_draw_img.c @@ -142,9 +142,9 @@ lv_res_t lv_img_dsc_get_info(const char * src, lv_img_header_t * header) header->cf = LV_IMG_CF_ALPHA_1BIT; } else { LV_LOG_WARN("Image get info found unknown src type"); - return false; + return LV_RES_INV; } - return true; + return LV_RES_OK; } /** From b3f4bd1c46b0f9927d4a1c09d4e595ae818e8b96 Mon Sep 17 00:00:00 2001 From: manison Date: Fri, 5 Apr 2019 14:10:38 +0200 Subject: [PATCH 3/4] only close file if it was successfully opened and return error from lv_img_dsc_get_info on file operation failure --- src/lv_draw/lv_draw_img.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c index 9b1849164..be9eba7da 100644 --- a/src/lv_draw/lv_draw_img.c +++ b/src/lv_draw/lv_draw_img.c @@ -120,6 +120,7 @@ lv_res_t lv_img_dsc_get_info(const char * src, lv_img_header_t * header) res = lv_fs_open(&file, src, LV_FS_MODE_RD); if(res == LV_FS_RES_OK) { res = lv_fs_read(&file, header, sizeof(lv_img_header_t), &rn); + lv_fs_close(&file); } /*Create a dummy header on fs error*/ @@ -127,9 +128,8 @@ lv_res_t lv_img_dsc_get_info(const char * src, lv_img_header_t * header) header->w = LV_DPI; header->h = LV_DPI; header->cf = LV_IMG_CF_UNKNOWN; + return LV_RES_INV; } - - lv_fs_close(&file); } #endif else if(src_type == LV_IMG_SRC_SYMBOL) { From e47750864e513ddd81aded59220e8f6553cd7727 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 8 Apr 2019 14:36:20 +0200 Subject: [PATCH 4/4] rename LV_GROUP_KEY to LV_KEY --- porting/lv_port_indev_template.c | 10 +++++----- src/lv_core/lv_group.c | 2 +- src/lv_core/lv_group.h | 26 +++++++++++++------------- src/lv_core/lv_indev.c | 24 ++++++++++++------------ src/lv_objx/lv_btn.c | 6 +++--- src/lv_objx/lv_btnm.c | 8 ++++---- src/lv_objx/lv_calendar.c | 4 ++-- src/lv_objx/lv_cb.c | 4 ++-- src/lv_objx/lv_ddlist.c | 6 +++--- src/lv_objx/lv_list.c | 4 ++-- src/lv_objx/lv_mbox.c | 6 +++--- src/lv_objx/lv_page.c | 12 ++++++------ src/lv_objx/lv_page.h | 6 +++--- src/lv_objx/lv_roller.c | 4 ++-- src/lv_objx/lv_slider.c | 4 ++-- src/lv_objx/lv_spinbox.c | 8 ++++---- src/lv_objx/lv_sw.c | 4 ++-- src/lv_objx/lv_ta.c | 18 +++++++++--------- 18 files changed, 78 insertions(+), 78 deletions(-) diff --git a/porting/lv_port_indev_template.c b/porting/lv_port_indev_template.c index 2e243190f..7666023bf 100644 --- a/porting/lv_port_indev_template.c +++ b/porting/lv_port_indev_template.c @@ -296,19 +296,19 @@ static bool keypad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data) /*Translate the keys to LittlevGL control characters according to your key definitions*/ switch(act_key) { case 1: - act_key = LV_GROUP_KEY_NEXT; + act_key = LV_KEY_NEXT; break; case 2: - act_key = LV_GROUP_KEY_PREV; + act_key = LV_KEY_PREV; break; case 3: - act_key = LV_GROUP_KEY_LEFT; + act_key = LV_KEY_LEFT; break; case 4: - act_key = LV_GROUP_KEY_RIGHT; + act_key = LV_KEY_RIGHT; break; case 5: - act_key = LV_GROUP_KEY_ENTER; + act_key = LV_KEY_ENTER; break; } diff --git a/src/lv_core/lv_group.c b/src/lv_core/lv_group.c index 66782fa4b..7ea018548 100644 --- a/src/lv_core/lv_group.c +++ b/src/lv_core/lv_group.c @@ -276,7 +276,7 @@ void lv_group_focus_freeze(lv_group_t * group, bool en) /** * Send a control character to the focuses object of a group * @param group pointer to a group - * @param c a character (use LV_GROUP_KEY_.. to navigate) + * @param c a character (use LV_KEY_.. to navigate) * @return result of focused object in group. */ lv_res_t lv_group_send_data(lv_group_t * group, uint32_t c) diff --git a/src/lv_core/lv_group.h b/src/lv_core/lv_group.h index fa364432f..f33ed03a7 100644 --- a/src/lv_core/lv_group.h +++ b/src/lv_core/lv_group.h @@ -26,18 +26,18 @@ extern "C" { *********************/ /*Predefined keys to control the focused object via lv_group_send(group, c)*/ /*For compatibility in signal function define the keys regardless to LV_GROUP*/ -#define LV_GROUP_KEY_UP 17 /*0x11*/ -#define LV_GROUP_KEY_DOWN 18 /*0x12*/ -#define LV_GROUP_KEY_RIGHT 19 /*0x13*/ -#define LV_GROUP_KEY_LEFT 20 /*0x14*/ -#define LV_GROUP_KEY_ESC 27 /*0x1B*/ -#define LV_GROUP_KEY_DEL 127 /*0x7F*/ -#define LV_GROUP_KEY_BACKSPACE 8 /*0x08*/ -#define LV_GROUP_KEY_ENTER 10 /*0x0A, '\n'*/ -#define LV_GROUP_KEY_NEXT 9 /*0x09, '\t'*/ -#define LV_GROUP_KEY_PREV 11 /*0x0B, '*/ -#define LV_GROUP_KEY_HOME 2 /*0x02, STX*/ -#define LV_GROUP_KEY_END 3 /*0x03, ETX*/ +#define LV_KEY_UP 17 /*0x11*/ +#define LV_KEY_DOWN 18 /*0x12*/ +#define LV_KEY_RIGHT 19 /*0x13*/ +#define LV_KEY_LEFT 20 /*0x14*/ +#define LV_KEY_ESC 27 /*0x1B*/ +#define LV_KEY_DEL 127 /*0x7F*/ +#define LV_KEY_BACKSPACE 8 /*0x08*/ +#define LV_KEY_ENTER 10 /*0x0A, '\n'*/ +#define LV_KEY_NEXT 9 /*0x09, '\t'*/ +#define LV_KEY_PREV 11 /*0x0B, '*/ +#define LV_KEY_HOME 2 /*0x02, STX*/ +#define LV_KEY_END 3 /*0x03, ETX*/ #if LV_USE_GROUP != 0 /********************** @@ -144,7 +144,7 @@ void lv_group_focus_freeze(lv_group_t * group, bool en); /** * Send a control character to the focuses object of a group * @param group pointer to a group - * @param c a character (use LV_GROUP_KEY_.. to navigate) + * @param c a character (use LV_KEY_.. to navigate) * @return result of focused object in group. */ lv_res_t lv_group_send_data(lv_group_t * group, uint32_t c); diff --git a/src/lv_core/lv_indev.c b/src/lv_core/lv_indev.c index 5f0792c60..d57af72e0 100644 --- a/src/lv_core/lv_indev.c +++ b/src/lv_core/lv_indev.c @@ -401,24 +401,24 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) i->proc.pr_timestamp = lv_tick_get(); /*Simulate a press on the object if ENTER was pressed*/ - if(data->key == LV_GROUP_KEY_ENTER) { + if(data->key == LV_KEY_ENTER) { 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*/ /*Send the ENTER as a normal KEY*/ - lv_group_send_data(g, LV_GROUP_KEY_ENTER); + lv_group_send_data(g, LV_KEY_ENTER); } /*Move the focus on NEXT*/ - else if(data->key == LV_GROUP_KEY_NEXT) { + else if(data->key == LV_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*/ } /*Move the focus on PREV*/ - else if(data->key == LV_GROUP_KEY_PREV) { + else if(data->key == LV_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); @@ -435,7 +435,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) if(i->proc.long_pr_sent == 0 && lv_tick_elaps(i->proc.pr_timestamp) > i->driver.long_press_time) { i->proc.long_pr_sent = 1; - if(data->key == LV_GROUP_KEY_ENTER) { + if(data->key == LV_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*/ @@ -450,21 +450,21 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) i->proc.longpr_rep_timestamp = lv_tick_get(); /*Send LONG_PRESS_REP on ENTER*/ - if(data->key == LV_GROUP_KEY_ENTER) { + if(data->key == LV_KEY_ENTER) { focused->signal_cb(focused, LV_SIGNAL_LONG_PRESS_REP, NULL); if(i->proc.reset_query) return; /*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*/ } /*Move the focus on NEXT again*/ - else if(data->key == LV_GROUP_KEY_NEXT) { + else if(data->key == LV_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*/ } /*Move the focus on PREV again*/ - else if(data->key == LV_GROUP_KEY_PREV) { + else if(data->key == LV_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); @@ -481,7 +481,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) else if(data->state == LV_INDEV_STATE_REL && prev_state == LV_INDEV_STATE_PR) { /*The user might clear the key when it was released. Always release the pressed key*/ data->key = prev_key; - if(data->key == LV_GROUP_KEY_ENTER) { + if(data->key == LV_KEY_ENTER) { focused->signal_cb(focused, LV_SIGNAL_RELEASED, NULL); if(i->proc.reset_query) return; /*The object might be deleted*/ @@ -535,9 +535,9 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data) if(lv_group_get_editing(g)) { int32_t s; if(data->enc_diff < 0) { - for(s = 0; s < -data->enc_diff; s++) lv_group_send_data(g, LV_GROUP_KEY_LEFT); + for(s = 0; s < -data->enc_diff; s++) lv_group_send_data(g, LV_KEY_LEFT); } else if(data->enc_diff > 0) { - for(s = 0; s < data->enc_diff; s++) lv_group_send_data(g, LV_GROUP_KEY_RIGHT); + for(s = 0; s < data->enc_diff; s++) lv_group_send_data(g, LV_KEY_RIGHT); } } /*In navigate mode focus on the next/prev objects*/ @@ -633,7 +633,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data) lv_event_send(focused, LV_EVENT_RELEASED, NULL); if(i->proc.reset_query) return; /*The object might be deleted*/ - lv_group_send_data(g, LV_GROUP_KEY_ENTER); + lv_group_send_data(g, LV_KEY_ENTER); } } /*If the focused object is editable and now in navigate mode then on enter switch edit diff --git a/src/lv_objx/lv_btn.c b/src/lv_objx/lv_btn.c index 6c64f3871..1771514d5 100644 --- a/src/lv_objx/lv_btn.c +++ b/src/lv_objx/lv_btn.c @@ -600,13 +600,13 @@ static lv_res_t lv_btn_signal(lv_obj_t * btn, lv_signal_t sign, void * param) #endif } else if(sign == LV_SIGNAL_CONTROL) { char c = *((char *)param); - if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_UP) { + if(c == LV_KEY_RIGHT || c == LV_KEY_UP) { if(lv_btn_get_toggle(btn)) lv_btn_set_state(btn, LV_BTN_STATE_TGL_REL); - } else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_DOWN) { + } else if(c == LV_KEY_LEFT || c == LV_KEY_DOWN) { if(lv_btn_get_toggle(btn)) lv_btn_set_state(btn, LV_BTN_STATE_REL); } - // else if(c == LV_GROUP_KEY_ENTER) { + // else if(c == LV_KEY_ENTER) { // if(lv_btn_get_toggle(btn)) { // if(state == LV_BTN_STATE_REL || state == LV_BTN_STATE_PR) // lv_btn_set_state(btn, LV_BTN_STATE_TGL_REL); else if(state == diff --git a/src/lv_objx/lv_btnm.c b/src/lv_objx/lv_btnm.c index 7d4e74fdd..98ccdd925 100644 --- a/src/lv_objx/lv_btnm.c +++ b/src/lv_objx/lv_btnm.c @@ -817,7 +817,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param) lv_obj_invalidate(btnm); } else if(sign == LV_SIGNAL_CONTROL) { char c = *((char *)param); - if(c == LV_GROUP_KEY_RIGHT) { + if(c == LV_KEY_RIGHT) { if(ext->btn_id_pr == LV_BTNM_BTN_NONE) ext->btn_id_pr = 0; else @@ -825,12 +825,12 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param) if(ext->btn_id_pr >= ext->btn_cnt - 1) ext->btn_id_pr = ext->btn_cnt - 1; ext->btn_id_act = ext->btn_id_pr; lv_obj_invalidate(btnm); - } else if(c == LV_GROUP_KEY_LEFT) { + } else if(c == LV_KEY_LEFT) { if(ext->btn_id_pr == LV_BTNM_BTN_NONE) ext->btn_id_pr = 0; if(ext->btn_id_pr > 0) ext->btn_id_pr--; ext->btn_id_act = ext->btn_id_pr; lv_obj_invalidate(btnm); - } else if(c == LV_GROUP_KEY_DOWN) { + } else if(c == LV_KEY_DOWN) { lv_style_t * style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BG); /*Find the area below the the current*/ if(ext->btn_id_pr == LV_BTNM_BTN_NONE) { @@ -852,7 +852,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param) } ext->btn_id_act = ext->btn_id_pr; lv_obj_invalidate(btnm); - } else if(c == LV_GROUP_KEY_UP) { + } else if(c == LV_KEY_UP) { lv_style_t * style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BG); /*Find the area below the the current*/ if(ext->btn_id_pr == LV_BTNM_BTN_NONE) { diff --git a/src/lv_objx/lv_calendar.c b/src/lv_objx/lv_calendar.c index 35585defc..311b0f1db 100644 --- a/src/lv_objx/lv_calendar.c +++ b/src/lv_objx/lv_calendar.c @@ -528,7 +528,7 @@ static lv_res_t lv_calendar_signal(lv_obj_t * calendar, lv_signal_t sign, void * } else if(sign == LV_SIGNAL_CONTROL) { uint8_t c = *((uint8_t *)param); lv_calendar_ext_t * ext = lv_obj_get_ext_attr(calendar); - if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_UP) { + if(c == LV_KEY_RIGHT || c == LV_KEY_UP) { if(ext->showed_date.month >= 12) { ext->showed_date.month = 1; ext->showed_date.year++; @@ -536,7 +536,7 @@ static lv_res_t lv_calendar_signal(lv_obj_t * calendar, lv_signal_t sign, void * ext->showed_date.month++; } lv_obj_invalidate(calendar); - } else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_DOWN) { + } else if(c == LV_KEY_LEFT || c == LV_KEY_DOWN) { if(ext->showed_date.month <= 1) { ext->showed_date.month = 12; ext->showed_date.year--; diff --git a/src/lv_objx/lv_cb.c b/src/lv_objx/lv_cb.c index a96e1bd9d..dba03b4a8 100644 --- a/src/lv_objx/lv_cb.c +++ b/src/lv_objx/lv_cb.c @@ -322,8 +322,8 @@ static lv_res_t lv_cb_signal(lv_obj_t * cb, lv_signal_t sign, void * param) lv_btn_set_state(ext->bullet, lv_btn_get_state(cb)); } else if(sign == LV_SIGNAL_CONTROL) { char c = *((char *)param); - if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_DOWN || c == LV_GROUP_KEY_LEFT || - c == LV_GROUP_KEY_UP) { + if(c == LV_KEY_RIGHT || c == LV_KEY_DOWN || c == LV_KEY_LEFT || + c == LV_KEY_UP) { lv_btn_set_state(ext->bullet, lv_btn_get_state(cb)); } } else if(sign == LV_SIGNAL_GET_TYPE) { diff --git a/src/lv_objx/lv_ddlist.c b/src/lv_objx/lv_ddlist.c index d1407f95c..30ca7183c 100644 --- a/src/lv_objx/lv_ddlist.c +++ b/src/lv_objx/lv_ddlist.c @@ -668,7 +668,7 @@ static lv_res_t lv_ddlist_signal(lv_obj_t * ddlist, lv_signal_t sign, void * par } } else if(sign == LV_SIGNAL_CONTROL) { char c = *((char *)param); - if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_DOWN) { + if(c == LV_KEY_RIGHT || c == LV_KEY_DOWN) { if(!ext->opened) { ext->opened = 1; lv_ddlist_refr_size(ddlist, true); @@ -679,7 +679,7 @@ static lv_res_t lv_ddlist_signal(lv_obj_t * ddlist, lv_signal_t sign, void * par lv_ddlist_pos_current_option(ddlist); lv_obj_invalidate(ddlist); } - } else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_UP) { + } else if(c == LV_KEY_LEFT || c == LV_KEY_UP) { if(!ext->opened) { ext->opened = 1; lv_ddlist_refr_size(ddlist, true); @@ -689,7 +689,7 @@ static lv_res_t lv_ddlist_signal(lv_obj_t * ddlist, lv_signal_t sign, void * par lv_ddlist_pos_current_option(ddlist); lv_obj_invalidate(ddlist); } - } else if(c == LV_GROUP_KEY_ESC) { + } else if(c == LV_KEY_ESC) { if(ext->opened) { ext->opened = 0; ext->sel_opt_id = ext->sel_opt_id_ori; diff --git a/src/lv_objx/lv_list.c b/src/lv_objx/lv_list.c index c8c135fe4..887edb60e 100644 --- a/src/lv_objx/lv_list.c +++ b/src/lv_objx/lv_list.c @@ -812,7 +812,7 @@ static lv_res_t lv_list_signal(lv_obj_t * list, lv_signal_t sign, void * param) #if LV_USE_GROUP char c = *((char *)param); - if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_DOWN) { + if(c == LV_KEY_RIGHT || c == LV_KEY_DOWN) { lv_list_ext_t * ext = lv_obj_get_ext_attr(list); /*If there is a valid selected button the make the previous selected*/ if(ext->selected_btn) { @@ -827,7 +827,7 @@ static lv_res_t lv_list_signal(lv_obj_t * list, lv_signal_t sign, void * param) list, btn); /*If there are no buttons on the list then there is no first button*/ } - } else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_UP) { + } else if(c == LV_KEY_LEFT || c == LV_KEY_UP) { lv_list_ext_t * ext = lv_obj_get_ext_attr(list); /*If there is a valid selected button the make the next selected*/ if(ext->selected_btn != NULL) { diff --git a/src/lv_objx/lv_mbox.c b/src/lv_objx/lv_mbox.c index 8a5a34871..ca626f1ee 100644 --- a/src/lv_objx/lv_mbox.c +++ b/src/lv_objx/lv_mbox.c @@ -406,12 +406,12 @@ static lv_res_t lv_mbox_signal(lv_obj_t * mbox, lv_signal_t sign, void * param) { lv_res_t res; - /*Translate LV_GROUP_KEY_UP/DOWN to LV_GROUP_KEY_LEFT/RIGHT */ + /*Translate LV_KEY_UP/DOWN to LV_KEY_LEFT/RIGHT */ char c_trans = 0; if(sign == LV_SIGNAL_CONTROL) { c_trans = *((char *)param); - if(c_trans == LV_GROUP_KEY_DOWN) c_trans = LV_GROUP_KEY_LEFT; - if(c_trans == LV_GROUP_KEY_UP) c_trans = LV_GROUP_KEY_RIGHT; + if(c_trans == LV_KEY_DOWN) c_trans = LV_KEY_LEFT; + if(c_trans == LV_KEY_UP) c_trans = LV_KEY_RIGHT; param = &c_trans; } diff --git a/src/lv_objx/lv_page.c b/src/lv_objx/lv_page.c index e5e99f5d7..d81e3ce28 100644 --- a/src/lv_objx/lv_page.c +++ b/src/lv_objx/lv_page.c @@ -204,7 +204,7 @@ void lv_page_set_sb_mode(lv_obj_t * page, lv_sb_mode_t sb_mode) /** * Enable/Disable scrolling with arrows if the page is in group (arrows: - * LV_GROUP_KEY_LEFT/RIGHT/UP/DOWN) + * LV_KEY_LEFT/RIGHT/UP/DOWN) * @param page pointer to a page object * @param en true: enable scrolling with arrows */ @@ -290,7 +290,7 @@ lv_sb_mode_t lv_page_get_sb_mode(const lv_obj_t * page) } /** - * Get the the scrolling with arrows (LV_GROUP_KEY_LEFT/RIGHT/UP/DOWN) is enabled or not + * Get the the scrolling with arrows (LV_KEY_LEFT/RIGHT/UP/DOWN) is enabled or not * @param page pointer to a page object * @return true: scrolling with arrows is enabled */ @@ -818,18 +818,18 @@ static lv_res_t lv_page_signal(lv_obj_t * page, lv_signal_t sign, void * param) } else if(sign == LV_SIGNAL_CONTROL) { uint32_t c = *((uint32_t *)param); - if((c == LV_GROUP_KEY_DOWN) && ext->arrow_scroll) { + if((c == LV_KEY_DOWN) && ext->arrow_scroll) { lv_page_scroll_ver(page, -lv_obj_get_height(page) / 4); - } else if((c == LV_GROUP_KEY_UP) && ext->arrow_scroll) { + } else if((c == LV_KEY_UP) && ext->arrow_scroll) { lv_page_scroll_ver(page, lv_obj_get_height(page) / 4); - } else if((c == LV_GROUP_KEY_RIGHT) && ext->arrow_scroll) { + } else if((c == LV_KEY_RIGHT) && ext->arrow_scroll) { /*If the page can't be scrolled horizontally because it's not wide enough then scroll it * vertically*/ if(lv_page_get_scrl_width(page) <= lv_obj_get_width(page)) lv_page_scroll_ver(page, -lv_obj_get_height(page) / 4); else lv_page_scroll_hor(page, -lv_obj_get_width(page) / 4); - } else if((c == LV_GROUP_KEY_LEFT) && ext->arrow_scroll) { + } else if((c == LV_KEY_LEFT) && ext->arrow_scroll) { /*If the page can't be scrolled horizontally because it's not wide enough then scroll it * vertically*/ if(lv_page_get_scrl_width(page) <= lv_obj_get_width(page)) diff --git a/src/lv_objx/lv_page.h b/src/lv_objx/lv_page.h index 17c7e8ab2..0d7865ce7 100644 --- a/src/lv_objx/lv_page.h +++ b/src/lv_objx/lv_page.h @@ -91,7 +91,7 @@ typedef struct In Progress)*/ } edge_flash; - uint8_t arrow_scroll : 1; /*1: Enable scrolling with LV_GROUP_KEY_LEFT/RIGHT/UP/DOWN*/ + uint8_t arrow_scroll : 1; /*1: Enable scrolling with LV_KEY_LEFT/RIGHT/UP/DOWN*/ uint8_t scroll_prop : 1; /*1: Propagate the scrolling the the parent if the edge is reached*/ uint8_t scroll_prop_ip : 1; /*1: Scroll propagation is in progress (used by the library)*/ } lv_page_ext_t; @@ -142,7 +142,7 @@ void lv_page_set_sb_mode(lv_obj_t * page, lv_sb_mode_t sb_mode); /** * Enable/Disable scrolling with arrows if the page is in group (arrows: - * LV_GROUP_KEY_LEFT/RIGHT/UP/DOWN) + * LV_KEY_LEFT/RIGHT/UP/DOWN) * @param page pointer to a page object * @param en true: enable scrolling with arrows */ @@ -251,7 +251,7 @@ void lv_page_set_style(lv_obj_t * page, lv_page_style_t type, lv_style_t * style lv_sb_mode_t lv_page_get_sb_mode(const lv_obj_t * page); /** - * Get the the scrolling with arrows (LV_GROUP_KEY_LEFT/RIGHT/UP/DOWN) is enabled or not + * Get the the scrolling with arrows (LV_KEY_LEFT/RIGHT/UP/DOWN) is enabled or not * @param page pointer to a page object * @return true: scrolling with arrows is enabled */ diff --git a/src/lv_objx/lv_roller.c b/src/lv_objx/lv_roller.c index 5cb3ab7ac..dcfc5c070 100644 --- a/src/lv_objx/lv_roller.c +++ b/src/lv_objx/lv_roller.c @@ -452,14 +452,14 @@ static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * par #endif } else if(sign == LV_SIGNAL_CONTROL) { char c = *((char *)param); - if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_DOWN) { + if(c == LV_KEY_RIGHT || c == LV_KEY_DOWN) { if(ext->ddlist.sel_opt_id + 1 < ext->ddlist.option_cnt) { uint16_t ori_id = ext->ddlist.sel_opt_id_ori; /*lv_roller_set_selceted will overwrite this*/ lv_roller_set_selected(roller, ext->ddlist.sel_opt_id + 1, true); ext->ddlist.sel_opt_id_ori = ori_id; } - } else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_UP) { + } else if(c == LV_KEY_LEFT || c == LV_KEY_UP) { if(ext->ddlist.sel_opt_id > 0) { uint16_t ori_id = ext->ddlist.sel_opt_id_ori; /*lv_roller_set_selceted will overwrite this*/ diff --git a/src/lv_objx/lv_slider.c b/src/lv_objx/lv_slider.c index 231e6f862..47341778a 100644 --- a/src/lv_objx/lv_slider.c +++ b/src/lv_objx/lv_slider.c @@ -559,11 +559,11 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par ext->drag_value = LV_SLIDER_NOT_PRESSED; - if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_UP) { + if(c == LV_KEY_RIGHT || c == LV_KEY_UP) { lv_slider_set_value(slider, lv_slider_get_value(slider) + 1, true); res = lv_event_send(slider, LV_EVENT_VALUE_CHANGED, NULL); if(res != LV_RES_OK) return res; - } else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_DOWN) { + } else if(c == LV_KEY_LEFT || c == LV_KEY_DOWN) { lv_slider_set_value(slider, lv_slider_get_value(slider) - 1, true); res = lv_event_send(slider, LV_EVENT_VALUE_CHANGED, NULL); if(res != LV_RES_OK) return res; diff --git a/src/lv_objx/lv_spinbox.c b/src/lv_objx/lv_spinbox.c index 8efbab771..8fcb7c801 100644 --- a/src/lv_objx/lv_spinbox.c +++ b/src/lv_objx/lv_spinbox.c @@ -353,19 +353,19 @@ static lv_res_t lv_spinbox_signal(lv_obj_t * spinbox, lv_signal_t sign, void * p lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); uint32_t c = *((uint32_t *)param); /*uint32_t because can be UTF-8*/ - if(c == LV_GROUP_KEY_RIGHT) { + if(c == LV_KEY_RIGHT) { if(indev_type == LV_INDEV_TYPE_ENCODER) lv_spinbox_increment(spinbox); else lv_spinbox_step_next(spinbox); - } else if(c == LV_GROUP_KEY_LEFT) { + } else if(c == LV_KEY_LEFT) { if(indev_type == LV_INDEV_TYPE_ENCODER) lv_spinbox_decrement(spinbox); else lv_spinbox_step_previous(spinbox); - } else if(c == LV_GROUP_KEY_UP) { + } else if(c == LV_KEY_UP) { lv_spinbox_increment(spinbox); - } else if(c == LV_GROUP_KEY_DOWN) { + } else if(c == LV_KEY_DOWN) { lv_spinbox_decrement(spinbox); } else { lv_ta_add_char(spinbox, c); diff --git a/src/lv_objx/lv_sw.c b/src/lv_objx/lv_sw.c index 82ab4bef4..301fc6e1a 100644 --- a/src/lv_objx/lv_sw.c +++ b/src/lv_objx/lv_sw.c @@ -350,11 +350,11 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param) } } else if(sign == LV_SIGNAL_CONTROL) { char c = *((char *)param); - if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_UP) { + if(c == LV_KEY_RIGHT || c == LV_KEY_UP) { lv_slider_set_value(sw, LV_SW_MAX_VALUE, true); res = lv_event_send(sw, LV_EVENT_VALUE_CHANGED, NULL); if(res != LV_RES_OK) return res; - } else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_DOWN) { + } else if(c == LV_KEY_LEFT || c == LV_KEY_DOWN) { lv_slider_set_value(sw, 0, true); res = lv_event_send(sw, LV_EVENT_VALUE_CHANGED, NULL); if(res != LV_RES_OK) return res; diff --git a/src/lv_objx/lv_ta.c b/src/lv_objx/lv_ta.c index 6c6819268..813df66f7 100644 --- a/src/lv_objx/lv_ta.c +++ b/src/lv_objx/lv_ta.c @@ -368,7 +368,7 @@ void lv_ta_del_char(lv_obj_t * ta) if(cur_pos == 0) return; ta_insert_replace = NULL; - char del_buf[2] = {LV_GROUP_KEY_DEL, '\0'}; + char del_buf[2] = {LV_KEY_DEL, '\0'}; lv_event_send(ta, LV_EVENT_INSERT, del_buf); if(ta_insert_replace) { if(ta_insert_replace[0] == '\0') return; /*Drop this text*/ @@ -1276,21 +1276,21 @@ static lv_res_t lv_ta_signal(lv_obj_t * ta, lv_signal_t sign, void * param) } } else if(sign == LV_SIGNAL_CONTROL) { uint32_t c = *((uint32_t *)param); /*uint32_t because can be UTF-8*/ - if(c == LV_GROUP_KEY_RIGHT) + if(c == LV_KEY_RIGHT) lv_ta_cursor_right(ta); - else if(c == LV_GROUP_KEY_LEFT) + else if(c == LV_KEY_LEFT) lv_ta_cursor_left(ta); - else if(c == LV_GROUP_KEY_UP) + else if(c == LV_KEY_UP) lv_ta_cursor_up(ta); - else if(c == LV_GROUP_KEY_DOWN) + else if(c == LV_KEY_DOWN) lv_ta_cursor_down(ta); - else if(c == LV_GROUP_KEY_BACKSPACE) + else if(c == LV_KEY_BACKSPACE) lv_ta_del_char(ta); - else if(c == LV_GROUP_KEY_DEL) + else if(c == LV_KEY_DEL) lv_ta_del_char_forward(ta); - else if(c == LV_GROUP_KEY_HOME) + else if(c == LV_KEY_HOME) lv_ta_set_cursor_pos(ta, 0); - else if(c == LV_GROUP_KEY_END) + else if(c == LV_KEY_END) lv_ta_set_cursor_pos(ta, LV_TA_CURSOR_LAST); else { lv_ta_add_char(ta, c);