Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-21 06:53:01 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #134 from chenshijianworkgit/beta

Browse Source 
gauge's label count is not inherited
This commit is contained in:
Gabor Kiss-Vamosi 2018-03-01 10:12:05 +01:00 committed by GitHub
commit 7da60e219d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lv_objx/lv_gauge.c
View File

@ -1,6 +1,6 @@
/** /**
* @file lv_gauge.c * @file lv_gauge.c
* *
*/ */
@ -65,7 +65,7 @@ lv_obj_t * lv_gauge_create(lv_obj_t * par, lv_obj_t * copy)
/*Create the ancestor gauge*/ /*Create the ancestor gauge*/
lv_obj_t * new_gauge = lv_lmeter_create(par, copy); lv_obj_t * new_gauge = lv_lmeter_create(par, copy);
lv_mem_assert(new_gauge); lv_mem_assert(new_gauge);
/*Allocate the gauge type specific extended data*/ /*Allocate the gauge type specific extended data*/
lv_gauge_ext_t * ext = lv_obj_allocate_ext_attr(new_gauge, sizeof(lv_gauge_ext_t)); lv_gauge_ext_t * ext = lv_obj_allocate_ext_attr(new_gauge, sizeof(lv_gauge_ext_t));
lv_mem_assert(ext); lv_mem_assert(ext);
@ -106,11 +106,11 @@ lv_obj_t * lv_gauge_create(lv_obj_t * par, lv_obj_t * copy)
for(i = 0; i < ext->needle_count; i++) { for(i = 0; i < ext->needle_count; i++) {
ext->values[i] = copy_ext->values[i]; ext->values[i] = copy_ext->values[i];
} }
ext->label_count = copy_ext->label_count;
/*Refresh the style with new signal function*/ /*Refresh the style with new signal function*/
lv_obj_refresh_style(new_gauge); lv_obj_refresh_style(new_gauge);
} }
return new_gauge; return new_gauge;
} }