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

change memcpy to lv_style_copy

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-04-12 07:27:53 +02:00
parent ff6fb2611a
commit 1cbbd1c59b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lv_core/lv_style.c
View File

@ -116,14 +116,14 @@ void lv_style_init(void)
lv_style_scr.line.rounded = 0; lv_style_scr.line.rounded = 0;
/*Plain style (by default near the same as the screen style)*/ /*Plain style (by default near the same as the screen style)*/
memcpy(&lv_style_plain, &lv_style_scr, sizeof(lv_style_t)); lv_style_copy(&lv_style_plain, &lv_style_scr);
lv_style_plain.body.padding.left = LV_DPI / 12; lv_style_plain.body.padding.left = LV_DPI / 12;
lv_style_plain.body.padding.right = LV_DPI / 12; lv_style_plain.body.padding.right = LV_DPI / 12;
lv_style_plain.body.padding.top = LV_DPI / 12; lv_style_plain.body.padding.top = LV_DPI / 12;
lv_style_plain.body.padding.bottom = LV_DPI / 12; lv_style_plain.body.padding.bottom = LV_DPI / 12;
/*Plain color style*/ /*Plain color style*/
memcpy(&lv_style_plain_color, &lv_style_plain, sizeof(lv_style_t)); lv_style_copy(&lv_style_plain_color, &lv_style_plain);
lv_style_plain_color.text.color = lv_color_make(0xf0, 0xf0, 0xf0); lv_style_plain_color.text.color = lv_color_make(0xf0, 0xf0, 0xf0);
lv_style_plain_color.image.color = lv_color_make(0xf0, 0xf0, 0xf0); lv_style_plain_color.image.color = lv_color_make(0xf0, 0xf0, 0xf0);
lv_style_plain_color.line.color = lv_color_make(0xf0, 0xf0, 0xf0); lv_style_plain_color.line.color = lv_color_make(0xf0, 0xf0, 0xf0);
@ -131,7 +131,7 @@ void lv_style_init(void)
lv_style_plain_color.body.grad_color = lv_style_plain_color.body.main_color; lv_style_plain_color.body.grad_color = lv_style_plain_color.body.main_color;
/*Pretty style */ /*Pretty style */
memcpy(&lv_style_pretty, &lv_style_plain, sizeof(lv_style_t)); lv_style_copy(&lv_style_pretty, &lv_style_plain);
lv_style_pretty.text.color = lv_color_make(0x20, 0x20, 0x20); lv_style_pretty.text.color = lv_color_make(0x20, 0x20, 0x20);
lv_style_pretty.image.color = lv_color_make(0x20, 0x20, 0x20); lv_style_pretty.image.color = lv_color_make(0x20, 0x20, 0x20);
lv_style_pretty.line.color = lv_color_make(0x20, 0x20, 0x20); lv_style_pretty.line.color = lv_color_make(0x20, 0x20, 0x20);
@ -143,7 +143,7 @@ void lv_style_init(void)
lv_style_pretty.body.border.opa = LV_OPA_30; lv_style_pretty.body.border.opa = LV_OPA_30;
/*Pretty color style*/ /*Pretty color style*/
memcpy(&lv_style_pretty_color, &lv_style_pretty, sizeof(lv_style_t)); lv_style_copy(&lv_style_pretty_color, &lv_style_pretty);
lv_style_pretty_color.text.color = lv_color_make(0xe0, 0xe0, 0xe0); lv_style_pretty_color.text.color = lv_color_make(0xe0, 0xe0, 0xe0);
lv_style_pretty_color.image.color = lv_color_make(0xe0, 0xe0, 0xe0); lv_style_pretty_color.image.color = lv_color_make(0xe0, 0xe0, 0xe0);
lv_style_pretty_color.line.color = lv_color_make(0xc0, 0xc0, 0xc0); lv_style_pretty_color.line.color = lv_color_make(0xc0, 0xc0, 0xc0);
@ -152,24 +152,24 @@ void lv_style_init(void)
lv_style_pretty_color.body.border.color = lv_color_make(0x15, 0x2c, 0x42); lv_style_pretty_color.body.border.color = lv_color_make(0x15, 0x2c, 0x42);
/*Transparent style*/ /*Transparent style*/
memcpy(&lv_style_transp, &lv_style_plain, sizeof(lv_style_t)); lv_style_copy(&lv_style_transp, &lv_style_plain);
lv_style_transp.glass = 1; lv_style_transp.glass = 1;
lv_style_transp.body.border.width = 0; lv_style_transp.body.border.width = 0;
lv_style_transp.body.opa = LV_OPA_TRANSP; lv_style_transp.body.opa = LV_OPA_TRANSP;
/*Transparent fitting size*/ /*Transparent fitting size*/
memcpy(&lv_style_transp_fit, &lv_style_transp, sizeof(lv_style_t)); lv_style_copy(&lv_style_transp_fit, &lv_style_transp);
lv_style_transp_fit.body.padding.left = 0; lv_style_transp_fit.body.padding.left = 0;
lv_style_transp_fit.body.padding.right = 0; lv_style_transp_fit.body.padding.right = 0;
lv_style_transp_fit.body.padding.top = 0; lv_style_transp_fit.body.padding.top = 0;
lv_style_transp_fit.body.padding.bottom = 0; lv_style_transp_fit.body.padding.bottom = 0;
/*Transparent tight style*/ /*Transparent tight style*/
memcpy(&lv_style_transp_tight, &lv_style_transp_fit, sizeof(lv_style_t)); lv_style_copy(&lv_style_transp_tight, &lv_style_transp_fit);
lv_style_transp_tight.body.padding.inner = 0; lv_style_transp_tight.body.padding.inner = 0;
/*Button released style*/ /*Button released style*/
memcpy(&lv_style_btn_rel, &lv_style_plain, sizeof(lv_style_t)); lv_style_copy(&lv_style_btn_rel, &lv_style_plain);
lv_style_btn_rel.body.main_color = lv_color_make(0x76, 0xa2, 0xd0); lv_style_btn_rel.body.main_color = lv_color_make(0x76, 0xa2, 0xd0);
lv_style_btn_rel.body.grad_color = lv_color_make(0x19, 0x3a, 0x5d); lv_style_btn_rel.body.grad_color = lv_color_make(0x19, 0x3a, 0x5d);
lv_style_btn_rel.body.radius = LV_DPI / 15; lv_style_btn_rel.body.radius = LV_DPI / 15;
@ -187,7 +187,7 @@ void lv_style_init(void)
lv_style_btn_rel.image.color = lv_color_make(0xff, 0xff, 0xff); lv_style_btn_rel.image.color = lv_color_make(0xff, 0xff, 0xff);
/*Button pressed style*/ /*Button pressed style*/
memcpy(&lv_style_btn_pr, &lv_style_btn_rel, sizeof(lv_style_t)); lv_style_copy(&lv_style_btn_pr, &lv_style_btn_rel);
lv_style_btn_pr.body.main_color = lv_color_make(0x33, 0x62, 0x94); lv_style_btn_pr.body.main_color = lv_color_make(0x33, 0x62, 0x94);
lv_style_btn_pr.body.grad_color = lv_color_make(0x10, 0x26, 0x3c); lv_style_btn_pr.body.grad_color = lv_color_make(0x10, 0x26, 0x3c);
lv_style_btn_pr.text.color = lv_color_make(0xa4, 0xb5, 0xc6); lv_style_btn_pr.text.color = lv_color_make(0xa4, 0xb5, 0xc6);
@ -195,7 +195,7 @@ void lv_style_init(void)
lv_style_btn_pr.line.color = lv_color_make(0xa4, 0xb5, 0xc6); lv_style_btn_pr.line.color = lv_color_make(0xa4, 0xb5, 0xc6);
/*Button toggle released style*/ /*Button toggle released style*/
memcpy(&lv_style_btn_tgl_rel, &lv_style_btn_rel, sizeof(lv_style_t)); lv_style_copy(&lv_style_btn_tgl_rel, &lv_style_btn_rel);
lv_style_btn_tgl_rel.body.main_color = lv_color_make(0x0a, 0x11, 0x22); lv_style_btn_tgl_rel.body.main_color = lv_color_make(0x0a, 0x11, 0x22);
lv_style_btn_tgl_rel.body.grad_color = lv_color_make(0x37, 0x62, 0x90); lv_style_btn_tgl_rel.body.grad_color = lv_color_make(0x37, 0x62, 0x90);
lv_style_btn_tgl_rel.body.border.color = lv_color_make(0x01, 0x07, 0x0d); lv_style_btn_tgl_rel.body.border.color = lv_color_make(0x01, 0x07, 0x0d);
@ -204,7 +204,7 @@ void lv_style_init(void)
lv_style_btn_tgl_rel.line.color = lv_color_make(0xc8, 0xdd, 0xf4); lv_style_btn_tgl_rel.line.color = lv_color_make(0xc8, 0xdd, 0xf4);
/*Button toggle pressed style*/ /*Button toggle pressed style*/
memcpy(&lv_style_btn_tgl_pr, &lv_style_btn_tgl_rel, sizeof(lv_style_t)); lv_style_copy(&lv_style_btn_tgl_pr, &lv_style_btn_tgl_rel);
lv_style_btn_tgl_pr.body.main_color = lv_color_make(0x02, 0x14, 0x27); lv_style_btn_tgl_pr.body.main_color = lv_color_make(0x02, 0x14, 0x27);
lv_style_btn_tgl_pr.body.grad_color = lv_color_make(0x2b, 0x4c, 0x70); lv_style_btn_tgl_pr.body.grad_color = lv_color_make(0x2b, 0x4c, 0x70);
lv_style_btn_tgl_pr.text.color = lv_color_make(0xa4, 0xb5, 0xc6); lv_style_btn_tgl_pr.text.color = lv_color_make(0xa4, 0xb5, 0xc6);
@ -212,7 +212,7 @@ void lv_style_init(void)
lv_style_btn_tgl_pr.line.color = lv_color_make(0xa4, 0xb5, 0xc6); lv_style_btn_tgl_pr.line.color = lv_color_make(0xa4, 0xb5, 0xc6);
/*Button inactive style*/ /*Button inactive style*/
memcpy(&lv_style_btn_ina, &lv_style_btn_rel, sizeof(lv_style_t)); lv_style_copy(&lv_style_btn_ina, &lv_style_btn_rel);
lv_style_btn_ina.body.main_color = lv_color_make(0xd8, 0xd8, 0xd8); lv_style_btn_ina.body.main_color = lv_color_make(0xd8, 0xd8, 0xd8);
lv_style_btn_ina.body.grad_color = lv_color_make(0xd8, 0xd8, 0xd8); lv_style_btn_ina.body.grad_color = lv_color_make(0xd8, 0xd8, 0xd8);
lv_style_btn_ina.body.border.color = lv_color_make(0x90, 0x90, 0x90); lv_style_btn_ina.body.border.color = lv_color_make(0x90, 0x90, 0x90);

2
src/lv_objx/lv_lmeter.c
View File

@ -253,7 +253,7 @@ static bool lv_lmeter_design(lv_obj_t * lmeter, const lv_area_t * mask, lv_desig
const lv_style_t * style = lv_obj_get_style(lmeter); const lv_style_t * style = lv_obj_get_style(lmeter);
lv_opa_t opa_scale = lv_obj_get_opa_scale(lmeter); lv_opa_t opa_scale = lv_obj_get_opa_scale(lmeter);
lv_style_t style_tmp; lv_style_t style_tmp;
memcpy(&style_tmp, style, sizeof(lv_style_t)); lv_style_copy(&style_tmp, style);
#if LV_USE_GROUP #if LV_USE_GROUP
lv_group_t * g = lv_obj_get_group(lmeter); lv_group_t * g = lv_obj_get_group(lmeter);