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

remove LV_TXT_FLAG_NO_BREAK. Text area in one line mode handle's it in its own

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-07-25 19:36:53 +02:00
parent c4aec5ae33
commit 2d5fa3b9dc
8 changed files with 40 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lv_core/lv_obj.c
View File

@@ -63,7 +63,7 @@ static lv_ll_t scr_ll; /*Linked list of screens*/
void lv_init(void)
{
#if USE_LV_LOG
lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, "lv_init called");
lv_log_add(LV_LOG_LEVEL_TRACE, __FILE__, __LINE__, "lv_init called");
#endif
/*Initialize the lv_misc modules*/
@@ -107,7 +107,7 @@ void lv_init(void)
#endif
#if USE_LV_LOG
lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, "lv_init finished");
lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, "lv_init ready");
#endif
}
@@ -124,9 +124,14 @@ void lv_init(void)
*/
lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
{
lv_obj_t * new_obj = NULL;
/*Create a screen if the parent is NULL*/
if(parent == NULL) {
#if USE_LV_LOG
lv_log_add(LV_LOG_LEVEL_TRACE, __FILE__, __LINE__, "Screen create started");
#endif
new_obj = lv_ll_ins_head(&scr_ll);
lv_mem_assert(new_obj);
if(new_obj == NULL) return NULL;
@@ -176,9 +181,16 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
new_obj->opa_scale = LV_OPA_COVER;
new_obj->ext_attr = NULL;
#if USE_LV_LOG
lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, "Screen create ready");
#endif
}
/*parent != NULL create normal obj. on a parent*/
else {
#if USE_LV_LOG
lv_log_add(LV_LOG_LEVEL_TRACE, __FILE__, __LINE__, "Object create started");
#endif
new_obj = lv_ll_ins_head(&(parent)->child_ll);
lv_mem_assert(new_obj);
if(new_obj == NULL) return NULL;
@@ -260,6 +272,10 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
#endif
lv_obj_set_pos(new_obj, lv_obj_get_x(copy), lv_obj_get_y(copy));
#if USE_LV_LOG
lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, "Object create ready");
#endif
}