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

LV_UPSCALE_STYLE and LV_STYLE MULT removed and replaced with LV_DOWNSCALE

Browse Source
This commit is contained in:
Gabor
2016-12-20 15:08:11 +01:00
parent 3566b74dab
commit cc0d2fef7d
16 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lv_objx/lv_rect.c
View File

@@ -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