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

chore(label) make selection interface naming consistent (#3595)

Browse Source
This commit is contained in:
Carlos Diaz
2022-08-18 17:44:18 -05:00
committed by GitHub
parent 956c47f6a7
commit 430574ed5f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/label/lv_label.c
View File

@@ -216,7 +216,7 @@ void lv_label_set_recolor(lv_obj_t * obj, bool en)
lv_label_refr_text(obj); 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); 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 #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); LV_ASSERT_OBJ(obj, MY_CLASS);

4
src/widgets/label/lv_label.h
View File

@@ -140,14 +140,14 @@ void lv_label_set_recolor(lv_obj_t * obj, bool en);
* @param obj pointer to a label object * @param obj pointer to a label object
* @param index character index from where selection should start. `LV_LABEL_TEXT_SELECTION_OFF` for no selection * @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 * Set where text selection should end
* @param obj pointer to a label object * @param obj pointer to a label object
* @param index character index where selection should end. `LV_LABEL_TEXT_SELECTION_OFF` for no selection * @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 * Getter functions

4
src/widgets/textarea/lv_textarea.c
View File

@@ -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 || 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_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_selection_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_end(ta->label, LV_DRAW_LABEL_NO_TXT_SEL);
} }
#else #else
LV_UNUSED(obj); /*Unused*/ LV_UNUSED(obj); /*Unused*/

4
tests/src/test_cases/test_label.c
View File

@@ -567,8 +567,8 @@ void test_label_text_selection(void)
const uint32_t selection_start = 0; const uint32_t selection_start = 0;
const uint32_t selection_end = strlen(lv_label_get_text(label)) - 1; 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_selection_start(label, selection_start);
lv_label_set_text_sel_end(label, selection_end); lv_label_set_text_selection_end(label, selection_end);
uint32_t start = lv_label_get_text_selection_start(label); uint32_t start = lv_label_get_text_selection_start(label);
uint32_t end = lv_label_get_text_selection_end(label); uint32_t end = lv_label_get_text_selection_end(label);