From 430574ed5f2a2229f63a7f998789ae679afda7f8 Mon Sep 17 00:00:00 2001 From: Carlos Diaz Date: Thu, 18 Aug 2022 17:44:18 -0500 Subject: [PATCH] chore(label) make selection interface naming consistent (#3595) --- src/widgets/label/lv_label.c | 4 ++-- src/widgets/label/lv_label.h | 4 ++-- src/widgets/textarea/lv_textarea.c | 4 ++-- tests/src/test_cases/test_label.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/widgets/label/lv_label.c b/src/widgets/label/lv_label.c index ea3aef096..3e824619e 100644 --- a/src/widgets/label/lv_label.c +++ b/src/widgets/label/lv_label.c @@ -216,7 +216,7 @@ void lv_label_set_recolor(lv_obj_t * obj, bool en) lv_label_refr_text(obj); } -void lv_label_set_text_sel_start(lv_obj_t * obj, uint32_t index) +void lv_label_set_text_selection_start(lv_obj_t * obj, uint32_t index) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -230,7 +230,7 @@ void lv_label_set_text_sel_start(lv_obj_t * obj, uint32_t index) #endif } -void lv_label_set_text_sel_end(lv_obj_t * obj, uint32_t index) +void lv_label_set_text_selection_end(lv_obj_t * obj, uint32_t index) { LV_ASSERT_OBJ(obj, MY_CLASS); diff --git a/src/widgets/label/lv_label.h b/src/widgets/label/lv_label.h index 4ffe6b870..9693b9042 100644 --- a/src/widgets/label/lv_label.h +++ b/src/widgets/label/lv_label.h @@ -140,14 +140,14 @@ void lv_label_set_recolor(lv_obj_t * obj, bool en); * @param obj pointer to a label object * @param index character index from where selection should start. `LV_LABEL_TEXT_SELECTION_OFF` for no selection */ -void lv_label_set_text_sel_start(lv_obj_t * obj, uint32_t index); +void lv_label_set_text_selection_start(lv_obj_t * obj, uint32_t index); /** * Set where text selection should end * @param obj pointer to a label object * @param index character index where selection should end. `LV_LABEL_TEXT_SELECTION_OFF` for no selection */ -void lv_label_set_text_sel_end(lv_obj_t * obj, uint32_t index); +void lv_label_set_text_selection_end(lv_obj_t * obj, uint32_t index); /*===================== * Getter functions diff --git a/src/widgets/textarea/lv_textarea.c b/src/widgets/textarea/lv_textarea.c index 241e05c6f..daf7b9b13 100644 --- a/src/widgets/textarea/lv_textarea.c +++ b/src/widgets/textarea/lv_textarea.c @@ -730,8 +730,8 @@ void lv_textarea_clear_selection(lv_obj_t * obj) if(lv_label_get_text_selection_start(ta->label) != LV_DRAW_LABEL_NO_TXT_SEL || lv_label_get_text_selection_end(ta->label) != LV_DRAW_LABEL_NO_TXT_SEL) { - lv_label_set_text_sel_start(ta->label, LV_DRAW_LABEL_NO_TXT_SEL); - lv_label_set_text_sel_end(ta->label, LV_DRAW_LABEL_NO_TXT_SEL); + lv_label_set_text_selection_start(ta->label, LV_DRAW_LABEL_NO_TXT_SEL); + lv_label_set_text_selection_end(ta->label, LV_DRAW_LABEL_NO_TXT_SEL); } #else LV_UNUSED(obj); /*Unused*/ diff --git a/tests/src/test_cases/test_label.c b/tests/src/test_cases/test_label.c index 8a8155889..1db3f0414 100644 --- a/tests/src/test_cases/test_label.c +++ b/tests/src/test_cases/test_label.c @@ -567,8 +567,8 @@ void test_label_text_selection(void) const uint32_t selection_start = 0; const uint32_t selection_end = strlen(lv_label_get_text(label)) - 1; - lv_label_set_text_sel_start(label, selection_start); - lv_label_set_text_sel_end(label, selection_end); + lv_label_set_text_selection_start(label, selection_start); + lv_label_set_text_selection_end(label, selection_end); uint32_t start = lv_label_get_text_selection_start(label); uint32_t end = lv_label_get_text_selection_end(label);