From cc0d2fef7d98445f884e976776fe7c4763277b14 Mon Sep 17 00:00:00 2001 From: Gabor Date: Tue, 20 Dec 2016 15:08:11 +0100 Subject: [PATCH] LV_UPSCALE_STYLE and LV_STYLE MULT removed and replaced with LV_DOWNSCALE --- lv_app/lv_app.c | 16 +++++++++------- lv_app/lv_app_sup.c | 6 +++--- lv_draw/lv_draw.c | 4 ++-- lv_obj/lv_obj.h | 6 ------ lv_objx/lv_btn.c | 20 ++++++++++---------- lv_objx/lv_cb.c | 14 +++++++------- lv_objx/lv_chart.c | 4 ++-- lv_objx/lv_label.c | 12 ++++++------ lv_objx/lv_led.c | 2 +- lv_objx/lv_line.c | 6 +++--- lv_objx/lv_list.c | 24 ++++++++++++------------ lv_objx/lv_mbox.c | 2 +- lv_objx/lv_page.c | 6 +++--- lv_objx/lv_rect.c | 14 +++++++------- lv_objx/lv_ta.c | 2 +- lv_objx/lv_win.c | 18 +++++++++--------- 16 files changed, 76 insertions(+), 80 deletions(-) diff --git a/lv_app/lv_app.c b/lv_app/lv_app.c index 695afa907..e10bb067a 100644 --- a/lv_app/lv_app.c +++ b/lv_app/lv_app.c @@ -720,9 +720,9 @@ static void lv_app_init_style(void) app_style.sc_page_style.bg_rects.hpad = 0; app_style.sc_page_style.bg_rects.opad = 0; app_style.sc_page_style.scrable_rects.objs.transp = 1; - app_style.sc_page_style.scrable_rects.hpad = 20 * LV_STYLE_MULT; - app_style.sc_page_style.scrable_rects.vpad = 20 * LV_STYLE_MULT; - app_style.sc_page_style.scrable_rects.opad = 20 * LV_STYLE_MULT; + app_style.sc_page_style.scrable_rects.hpad = 20 * LV_DOWNSCALE; + app_style.sc_page_style.scrable_rects.vpad = 20 * LV_DOWNSCALE; + app_style.sc_page_style.scrable_rects.opad = 20 * LV_DOWNSCALE; /*Shortcut styles*/ lv_btns_get(LV_BTNS_DEF,&app_style.sc_style); @@ -733,7 +733,7 @@ static void lv_app_init_style(void) app_style.sc_style.gcolor[LV_BTN_STATE_PR] = COLOR_MAKE(0x00, 0x00, 0x00); app_style.sc_style.bcolor[LV_BTN_STATE_PR] = COLOR_MAKE(0xB0, 0xD0, 0xF0); app_style.sc_style.rects.bopa = 70; - app_style.sc_style.rects.bwidth = 1 * LV_STYLE_MULT; + app_style.sc_style.rects.bwidth = 1 * LV_DOWNSCALE; lv_labels_get(LV_LABELS_DEF,&app_style.sc_title_style); app_style.sc_title_style.font = app_style.font_small; @@ -749,11 +749,13 @@ static void lv_app_init_style(void) app_style.win_style.header_on_content = 1; app_style.win_style.header_opa = app_style.menu_opa; app_style.win_style.ctrl_btn_opa = app_style.menu_btn_opa; - app_style.win_style.header.vpad = 5 * LV_STYLE_MULT; - app_style.win_style.header.hpad = 5 * LV_STYLE_MULT; - app_style.win_style.header.opad = 5 * LV_STYLE_MULT; + app_style.win_style.header.vpad = 5 * LV_DOWNSCALE; + app_style.win_style.header.hpad = 5 * LV_DOWNSCALE; + app_style.win_style.header.opad = 5 * LV_DOWNSCALE; app_style.win_style.content.bg_rects.vpad = app_style.win_style.ctrl_btn_h + 2 * app_style.win_style.header.vpad; + app_style.win_style.content.bg_rects.hpad = 5 * LV_DOWNSCALE; + app_style.win_style.content.scrable_rects.objs.transp = 1; } diff --git a/lv_app/lv_app_sup.c b/lv_app/lv_app_sup.c index 4893a5268..89431b46a 100644 --- a/lv_app/lv_app_sup.c +++ b/lv_app/lv_app_sup.c @@ -76,9 +76,9 @@ void lv_app_kb_open(lv_obj_t * ta, lv_app_kb_mode_t mode, void (*close)(lv_obj_t { if(kb_inited == false) { lv_btnms_get(LV_BTNMS_DEF, &kb_btnms); - kb_btnms.rects.opad = 4 + LV_STYLE_MULT; - kb_btnms.rects.vpad = 3 + LV_STYLE_MULT; - kb_btnms.rects.hpad = 3 + LV_STYLE_MULT; + kb_btnms.rects.opad = 4 + LV_DOWNSCALE; + kb_btnms.rects.vpad = 3 + LV_DOWNSCALE; + kb_btnms.rects.hpad = 3 + LV_DOWNSCALE; kb_inited = true; } diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c index bc68bbf1f..4623bf3c0 100644 --- a/lv_draw/lv_draw.c +++ b/lv_draw/lv_draw.c @@ -53,13 +53,13 @@ static void (*map_fp)(const area_t * cords_p, const area_t * mask_p, const color static lv_rects_t lv_img_no_pic_rects = { .objs.color = COLOR_BLACK, .gcolor = COLOR_BLACK, - .bcolor = COLOR_RED, .bwidth = 2 * LV_STYLE_MULT, .bopa = 100, + .bcolor = COLOR_RED, .bwidth = 2 * LV_DOWNSCALE, .bopa = 100, .round = 0, .empty = 0 }; static lv_labels_t lv_img_no_pic_labels = { .font = LV_FONT_DEFAULT, .objs.color = COLOR_WHITE, - .letter_space = 1 * LV_STYLE_MULT, .line_space = 1 * LV_STYLE_MULT, + .letter_space = 1 * LV_DOWNSCALE, .line_space = 1 * LV_DOWNSCALE, .mid = 1, }; diff --git a/lv_obj/lv_obj.h b/lv_obj/lv_obj.h index 4dffb0b48..81ab34afd 100644 --- a/lv_obj/lv_obj.h +++ b/lv_obj/lv_obj.h @@ -33,12 +33,6 @@ #endif /*New defines*/ -#if LV_UPSCALE_SYTLE != 0 -#define LV_STYLE_MULT LV_DOWNSCALE -#else -#define LV_STYLE_MULT 1 -#endif - #define LV_OBJ_DEF_WIDTH (80 * LV_DOWNSCALE) #define LV_OBJ_DEF_HEIGHT (60 * LV_DOWNSCALE) diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c index d53912999..91895065b 100644 --- a/lv_objx/lv_btn.c +++ b/lv_objx/lv_btn.c @@ -454,13 +454,13 @@ static void lv_btns_init(void) lv_btns_def.rects.objs.transp = 0; lv_btns_def.rects.empty = 0; lv_btns_def.rects.light = 0; - lv_btns_def.rects.bwidth = 2 * LV_STYLE_MULT; + lv_btns_def.rects.bwidth = 2 * LV_DOWNSCALE; lv_btns_def.rects.bopa = 50; lv_btns_def.rects.empty = 0; - lv_btns_def.rects.round = 4 * LV_STYLE_MULT; - lv_btns_def.rects.hpad = 10 * LV_STYLE_MULT; - lv_btns_def.rects.vpad = 15 * LV_STYLE_MULT; - lv_btns_def.rects.opad = 5 * LV_STYLE_MULT; + lv_btns_def.rects.round = 4 * LV_DOWNSCALE; + lv_btns_def.rects.hpad = 10 * LV_DOWNSCALE; + lv_btns_def.rects.vpad = 15 * LV_DOWNSCALE; + lv_btns_def.rects.opad = 5 * LV_DOWNSCALE; /*Transparent style*/ memcpy(&lv_btns_transp, &lv_btns_def, sizeof(lv_btns_t)); @@ -489,12 +489,12 @@ static void lv_btns_init(void) lv_btns_border.flags[LV_BTN_STATE_TGL_REL].empty = 1; lv_btns_border.flags[LV_BTN_STATE_TGL_PR].empty = 1; lv_btns_border.flags[LV_BTN_STATE_INA].empty = 1; - lv_btns_border.rects.bwidth = 2 * LV_STYLE_MULT; + lv_btns_border.rects.bwidth = 2 * LV_DOWNSCALE; lv_btns_border.rects.bopa = 50; - lv_btns_border.rects.round = 4 * LV_STYLE_MULT; - lv_btns_border.rects.hpad = 10 * LV_STYLE_MULT; - lv_btns_border.rects.vpad = 10 * LV_STYLE_MULT; - lv_btns_border.rects.vpad = 5 * LV_STYLE_MULT; + lv_btns_border.rects.round = 4 * LV_DOWNSCALE; + lv_btns_border.rects.hpad = 10 * LV_DOWNSCALE; + lv_btns_border.rects.vpad = 10 * LV_DOWNSCALE; + lv_btns_border.rects.vpad = 5 * LV_DOWNSCALE; } #endif diff --git a/lv_objx/lv_cb.c b/lv_objx/lv_cb.c index 631ca1e76..69e2c763f 100644 --- a/lv_objx/lv_cb.c +++ b/lv_objx/lv_cb.c @@ -233,9 +233,9 @@ static void lv_cbs_init(void) /*Bg style*/ lv_btns_get(LV_RECTS_TRANSP, &lv_cbs_def.bg); - lv_cbs_def.bg.rects.hpad = 0 * LV_STYLE_MULT; - lv_cbs_def.bg.rects.vpad = 0 * LV_STYLE_MULT; - lv_cbs_def.bg.rects.opad = 5 * LV_STYLE_MULT; + lv_cbs_def.bg.rects.hpad = 0 * LV_DOWNSCALE; + lv_cbs_def.bg.rects.vpad = 0 * LV_DOWNSCALE; + lv_cbs_def.bg.rects.opad = 5 * LV_DOWNSCALE; /*Bullet style*/ lv_btns_get(LV_BTNS_DEF, &lv_cbs_def.bullet); @@ -265,13 +265,13 @@ static void lv_cbs_init(void) lv_cbs_def.bullet.bcolor[LV_BTN_STATE_INA] = COLOR_WHITE; lv_cbs_def.bullet.light_en[LV_BTN_STATE_INA] = 0; - lv_cbs_def.bullet.rects.bwidth = 2 * LV_STYLE_MULT; + lv_cbs_def.bullet.rects.bwidth = 2 * LV_DOWNSCALE; lv_cbs_def.bullet.rects.bopa = 70; lv_cbs_def.bullet.rects.empty = 0; lv_cbs_def.bullet.rects.round = LV_OBJ_DEF_WIDTH / 3 / 4; - lv_cbs_def.bullet.rects.hpad = 0 * LV_STYLE_MULT; - lv_cbs_def.bullet.rects.vpad = 0 * LV_STYLE_MULT; - lv_cbs_def.bullet.rects.opad = 0 * LV_STYLE_MULT; + lv_cbs_def.bullet.rects.hpad = 0 * LV_DOWNSCALE; + lv_cbs_def.bullet.rects.vpad = 0 * LV_DOWNSCALE; + lv_cbs_def.bullet.rects.opad = 0 * LV_DOWNSCALE; /*Label*/ lv_labels_get(LV_LABELS_TXT, &lv_cbs_def.label); diff --git a/lv_objx/lv_chart.c b/lv_objx/lv_chart.c index c6b3e6aa4..2041e5f49 100644 --- a/lv_objx/lv_chart.c +++ b/lv_objx/lv_chart.c @@ -582,12 +582,12 @@ static void lv_charts_init(void) /* Div. line */ lv_lines_get(LV_LINES_DECOR, &lv_charts_def.div_lines); - lv_charts_def.div_lines.width = 1 * LV_STYLE_MULT; + lv_charts_def.div_lines.width = 1 * LV_DOWNSCALE; lv_charts_def.div_lines.objs.color = COLOR_BLACK; lv_charts_def.div_line_opa = OPA_COVER; /*Data lines*/ - lv_charts_def.width = 3 * LV_STYLE_MULT; + lv_charts_def.width = 3 * LV_DOWNSCALE; lv_charts_def.data_opa = 100; lv_charts_def.dark_eff = 150; lv_charts_def.color[0] = COLOR_RED; diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c index 838e27997..0b2f1f693 100644 --- a/lv_objx/lv_label.c +++ b/lv_objx/lv_label.c @@ -511,8 +511,8 @@ static void lv_labels_init(void) /*Default style*/ lv_labels_def.font = LV_FONT_DEFAULT; lv_labels_def.objs.color = COLOR_MAKE(0x10, 0x18, 0x20); - lv_labels_def.letter_space = 2 * LV_STYLE_MULT; - lv_labels_def.line_space = 2 * LV_STYLE_MULT; + lv_labels_def.letter_space = 2 * LV_DOWNSCALE; + lv_labels_def.line_space = 2 * LV_DOWNSCALE; lv_labels_def.mid = 0; memcpy(&lv_labels_btn, &lv_labels_def, sizeof(lv_labels_t)); @@ -521,14 +521,14 @@ static void lv_labels_init(void) memcpy(&lv_labels_title, &lv_labels_def, sizeof(lv_labels_t)); lv_labels_title.objs.color = COLOR_MAKE(0x10, 0x20, 0x30); - lv_labels_title.letter_space = 4 * LV_STYLE_MULT; - lv_labels_title.line_space = 4 * LV_STYLE_MULT; + lv_labels_title.letter_space = 4 * LV_DOWNSCALE; + lv_labels_title.line_space = 4 * LV_DOWNSCALE; lv_labels_title.mid = 0; memcpy(&lv_labels_txt, &lv_labels_def, sizeof(lv_labels_t)); lv_labels_txt.objs.color = COLOR_MAKE(0x16, 0x23, 0x34); - lv_labels_txt.letter_space = 0 * LV_STYLE_MULT; - lv_labels_txt.line_space = 1 * LV_STYLE_MULT; + lv_labels_txt.letter_space = 0 * LV_DOWNSCALE; + lv_labels_txt.line_space = 1 * LV_DOWNSCALE; lv_labels_txt.mid = 0; } diff --git a/lv_objx/lv_led.c b/lv_objx/lv_led.c index 259aeddfd..a64a54d5e 100644 --- a/lv_objx/lv_led.c +++ b/lv_objx/lv_led.c @@ -263,7 +263,7 @@ static void lv_leds_init(void) lv_leds_def.bg_rect.objs.color = COLOR_RED; lv_leds_def.bg_rect.gcolor = COLOR_MARRON, lv_leds_def.bg_rect.bcolor = COLOR_WHITE; - lv_leds_def.bg_rect.bwidth = 4 * LV_STYLE_MULT; + lv_leds_def.bg_rect.bwidth = 4 * LV_DOWNSCALE; lv_leds_def.bg_rect.bopa = 50; lv_leds_def.bg_rect.round = LV_RECT_CIRCLE; lv_leds_def.bg_rect.hpad = 0; diff --git a/lv_objx/lv_line.c b/lv_objx/lv_line.c index a1f682efa..1b1f72e8d 100644 --- a/lv_objx/lv_line.c +++ b/lv_objx/lv_line.c @@ -343,18 +343,18 @@ static bool lv_line_design(lv_obj_t * line, const area_t * mask, lv_design_mode_ static void lv_lines_init(void) { /*Default style*/ - lv_lines_def.width = 2 * LV_STYLE_MULT; + lv_lines_def.width = 2 * LV_DOWNSCALE; lv_lines_def.objs.color = COLOR_RED; lv_lines_def.objs.transp = 0; /*Decoration line style*/ memcpy(&lv_lines_decor, &lv_lines_def, sizeof(lv_lines_t)); - lv_lines_decor.width = 1 * LV_STYLE_MULT; + lv_lines_decor.width = 1 * LV_DOWNSCALE; lv_lines_decor.objs.color = COLOR_GRAY; /*Chart line style*/ memcpy(&lv_lines_chart, &lv_lines_def, sizeof(lv_lines_t)); - lv_lines_chart.width = 3 * LV_STYLE_MULT; + lv_lines_chart.width = 3 * LV_DOWNSCALE; lv_lines_chart.objs.color = COLOR_RED; } #endif diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c index 4f4649ffb..f4ad85e46 100644 --- a/lv_objx/lv_list.c +++ b/lv_objx/lv_list.c @@ -324,13 +324,13 @@ static void lv_lists_init(void) { /*Default style*/ lv_pages_get(LV_PAGES_TRANSP, &lv_lists_def.bg_pages); - lv_lists_def.bg_pages.bg_rects.vpad = 0 * LV_STYLE_MULT; - lv_lists_def.bg_pages.bg_rects.hpad = 0 * LV_STYLE_MULT; - lv_lists_def.bg_pages.bg_rects.opad = 0 * LV_STYLE_MULT; + lv_lists_def.bg_pages.bg_rects.vpad = 0 * LV_DOWNSCALE; + lv_lists_def.bg_pages.bg_rects.hpad = 0 * LV_DOWNSCALE; + lv_lists_def.bg_pages.bg_rects.opad = 0 * LV_DOWNSCALE; - lv_lists_def.bg_pages.scrable_rects.vpad = 10 * LV_STYLE_MULT; - lv_lists_def.bg_pages.scrable_rects.hpad = 10 * LV_STYLE_MULT; - lv_lists_def.bg_pages.scrable_rects.opad = 5 * LV_STYLE_MULT; + lv_lists_def.bg_pages.scrable_rects.vpad = 10 * LV_DOWNSCALE; + lv_lists_def.bg_pages.scrable_rects.hpad = 10 * LV_DOWNSCALE; + lv_lists_def.bg_pages.scrable_rects.opad = 5 * LV_DOWNSCALE; lv_btns_get(LV_BTNS_DEF, &lv_lists_def.liste_btns); /*List element button style*/ @@ -342,13 +342,13 @@ static void lv_lists_init(void) lv_lists_def.liste_layout = LV_RECT_LAYOUT_ROW_M; memcpy(&lv_lists_tight, &lv_lists_def, sizeof(lv_lists_t)); - lv_lists_tight.bg_pages.bg_rects.vpad = 0 * LV_STYLE_MULT; - lv_lists_tight.bg_pages.bg_rects.hpad = 0 * LV_STYLE_MULT; - lv_lists_tight.bg_pages.bg_rects.opad = 0 * LV_STYLE_MULT; + lv_lists_tight.bg_pages.bg_rects.vpad = 0 * LV_DOWNSCALE; + lv_lists_tight.bg_pages.bg_rects.hpad = 0 * LV_DOWNSCALE; + lv_lists_tight.bg_pages.bg_rects.opad = 0 * LV_DOWNSCALE; - lv_lists_tight.bg_pages.scrable_rects.vpad = 0 * LV_STYLE_MULT; - lv_lists_tight.bg_pages.scrable_rects.hpad = 0 * LV_STYLE_MULT; - lv_lists_tight.bg_pages.scrable_rects.opad = 0 * LV_STYLE_MULT; + lv_lists_tight.bg_pages.scrable_rects.vpad = 0 * LV_DOWNSCALE; + lv_lists_tight.bg_pages.scrable_rects.hpad = 0 * LV_DOWNSCALE; + lv_lists_tight.bg_pages.scrable_rects.opad = 0 * LV_DOWNSCALE; } #endif diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c index 62ccfd219..f8e604b1d 100644 --- a/lv_objx/lv_mbox.c +++ b/lv_objx/lv_mbox.c @@ -372,7 +372,7 @@ static void lv_temps_init(void) { /*Default style*/ lv_rects_get(LV_RECTS_DEF, &lv_mboxs_def.bg); - lv_mboxs_def.bg.light = 10 * LV_STYLE_MULT; + lv_mboxs_def.bg.light = 10 * LV_DOWNSCALE; lv_btns_get(LV_BTNS_DEF, &lv_mboxs_def.btn); lv_mboxs_def.btn.flags[LV_BTN_STATE_PR].light_en = 0; diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c index 0e0051750..50b16f414 100644 --- a/lv_objx/lv_page.c +++ b/lv_objx/lv_page.c @@ -562,10 +562,10 @@ static void lv_pages_init(void) lv_pages_def.sb_rects.objs.color = COLOR_BLACK; lv_pages_def.sb_rects.gcolor = COLOR_BLACK; lv_pages_def.sb_rects.bcolor = COLOR_WHITE; - lv_pages_def.sb_rects.bwidth = 1 * LV_STYLE_MULT; - lv_pages_def.sb_rects.round = 5 * LV_STYLE_MULT; + lv_pages_def.sb_rects.bwidth = 1 * LV_DOWNSCALE; + lv_pages_def.sb_rects.round = 5 * LV_DOWNSCALE; - lv_pages_def.sb_width= 8 * LV_STYLE_MULT; + lv_pages_def.sb_width= 8 * LV_DOWNSCALE; lv_pages_def.sb_opa=50; lv_pages_def.sb_mode = LV_PAGE_SB_MODE_AUTO; diff --git a/lv_objx/lv_rect.c b/lv_objx/lv_rect.c index e3134214b..5072575d3 100644 --- a/lv_objx/lv_rect.c +++ b/lv_objx/lv_rect.c @@ -717,13 +717,13 @@ static void lv_rects_init(void) lv_rects_def.objs.color = COLOR_MAKE(0x50, 0x70, 0x90); lv_rects_def.gcolor = COLOR_MAKE(0x70, 0xA0, 0xC0); lv_rects_def.bcolor = COLOR_WHITE; - lv_rects_def.bwidth = 2 * LV_STYLE_MULT; + lv_rects_def.bwidth = 2 * LV_DOWNSCALE; lv_rects_def.bopa = 50; - lv_rects_def.round = 4 * LV_STYLE_MULT; + lv_rects_def.round = 4 * LV_DOWNSCALE; lv_rects_def.empty = 0; - lv_rects_def.hpad = 10 * LV_STYLE_MULT; - lv_rects_def.vpad = 10 * LV_STYLE_MULT; - lv_rects_def.opad = 10 * LV_STYLE_MULT; + lv_rects_def.hpad = 10 * LV_DOWNSCALE; + lv_rects_def.vpad = 10 * LV_DOWNSCALE; + lv_rects_def.opad = 10 * LV_DOWNSCALE; lv_rects_def.light = 0; lv_rects_def.lcolor = COLOR_MAKE(0x60, 0x60, 0x60); @@ -736,9 +736,9 @@ static void lv_rects_init(void) /*Border style*/ memcpy(&lv_rects_border, &lv_rects_def, sizeof(lv_rects_t)); lv_rects_border.bcolor = COLOR_BLACK; - lv_rects_border.bwidth = 2 * LV_STYLE_MULT; + lv_rects_border.bwidth = 2 * LV_DOWNSCALE; lv_rects_border.bopa = 100; - lv_rects_border.round = 4 * LV_STYLE_MULT; + lv_rects_border.round = 4 * LV_DOWNSCALE; lv_rects_border.empty = 1; } #endif diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c index 2c642eb08..00646160e 100644 --- a/lv_objx/lv_ta.c +++ b/lv_objx/lv_ta.c @@ -567,7 +567,7 @@ static void lv_tas_init(void) lv_tas_def.labels.objs.color = COLOR_MAKE(0x20, 0x20, 0x20); lv_tas_def.cursor_color = COLOR_MAKE(0x10, 0x10, 0x10); - lv_tas_def.cursor_width = 1 * LV_STYLE_MULT; /*>=1 px for visible cursor*/ + lv_tas_def.cursor_width = 1 * LV_DOWNSCALE; /*>=1 px for visible cursor*/ lv_tas_def.cursor_show = 1; } #endif diff --git a/lv_objx/lv_win.c b/lv_objx/lv_win.c index 15b9b5225..b861b8f3b 100644 --- a/lv_objx/lv_win.c +++ b/lv_objx/lv_win.c @@ -389,7 +389,7 @@ static void lv_wins_init(void) lv_pages_get(LV_PAGES_DEF, &lv_wins_def.content); lv_wins_def.content.bg_rects.objs.color = COLOR_WHITE; lv_wins_def.content.bg_rects.gcolor = COLOR_WHITE; - lv_wins_def.content.bg_rects.bwidth = 1 * LV_STYLE_MULT; + lv_wins_def.content.bg_rects.bwidth = 1 * LV_DOWNSCALE; lv_wins_def.content.bg_rects.bcolor = COLOR_GRAY; lv_wins_def.content.bg_rects.round = 0; lv_wins_def.content.bg_rects.hpad = 0; @@ -398,8 +398,8 @@ static void lv_wins_init(void) /*Styles for the header*/ lv_rects_get(LV_RECTS_DEF, &lv_wins_def.header); - lv_wins_def.header.hpad = 5 * LV_STYLE_MULT; - lv_wins_def.header.vpad = 5 * LV_STYLE_MULT; + lv_wins_def.header.hpad = 5 * LV_DOWNSCALE; + lv_wins_def.header.vpad = 5 * LV_DOWNSCALE; lv_wins_def.header.objs.color = COLOR_MAKE(0x30, 0x40, 0x50); lv_wins_def.header.gcolor = COLOR_MAKE(0x30, 0x40, 0x50); lv_wins_def.header.bwidth = 0; @@ -408,14 +408,14 @@ static void lv_wins_init(void) lv_rects_get(LV_RECTS_TRANSP, &lv_wins_def.ctrl_holder); lv_wins_def.ctrl_holder.hpad = 0; lv_wins_def.ctrl_holder.vpad = 0; - lv_wins_def.ctrl_holder.opad = 10 * LV_STYLE_MULT; + lv_wins_def.ctrl_holder.opad = 10 * LV_DOWNSCALE; lv_btns_get(LV_BTNS_DEF, &lv_wins_def.ctrl_btn); lv_wins_def.ctrl_btn.bcolor[LV_BTN_STATE_REL] = COLOR_MAKE(0xD0, 0xE0, 0xF0); lv_wins_def.ctrl_btn.mcolor[LV_BTN_STATE_REL] = COLOR_MAKE(0x30, 0x40, 0x50); lv_wins_def.ctrl_btn.gcolor[LV_BTN_STATE_REL] = COLOR_MAKE(0x30, 0x40, 0x50); lv_wins_def.ctrl_btn.rects.bopa = 70; - lv_wins_def.ctrl_btn.rects.bwidth = 2 * LV_STYLE_MULT; + lv_wins_def.ctrl_btn.rects.bwidth = 2 * LV_DOWNSCALE; lv_wins_def.ctrl_btn.rects.round = LV_RECT_CIRCLE; lv_imgs_get(LV_IMGS_DEF, &lv_wins_def.ctrl_img); @@ -424,11 +424,11 @@ static void lv_wins_init(void) lv_labels_get(LV_LABELS_TITLE, &lv_wins_def.title); lv_wins_def.title.objs.color = COLOR_MAKE(0xD0, 0xE0, 0xF0); - lv_wins_def.title.letter_space = 1 * LV_STYLE_MULT; - lv_wins_def.title.line_space = 1 * LV_STYLE_MULT; + lv_wins_def.title.letter_space = 1 * LV_DOWNSCALE; + lv_wins_def.title.line_space = 1 * LV_DOWNSCALE; - lv_wins_def.ctrl_btn_w = 30 * LV_STYLE_MULT; - lv_wins_def.ctrl_btn_h = 30 * LV_STYLE_MULT; + lv_wins_def.ctrl_btn_w = 30 * LV_DOWNSCALE; + lv_wins_def.ctrl_btn_h = 30 * LV_DOWNSCALE; lv_wins_def.header_opa = OPA_COVER; lv_wins_def.ctrl_btn_opa = OPA_COVER;