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

Further modifications with styles

Browse Source
This commit is contained in:
Gabor
2016-06-16 10:57:03 +02:00
parent 1b263d5d8a
commit 3316a2ef25
13 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lv_objx/lv_rect.c
View File

@@ -33,16 +33,16 @@ static bool lv_rect_design(lv_obj_t* obj_dp, const area_t * mask_p, lv_design_mo
static lv_rects_t lv_rects_def =
{ .objs.color = COLOR_MAKE(0x50, 0x70, 0x90), .gcolor = COLOR_MAKE(0x20, 0x40, 0x60),
.bcolor = COLOR_WHITE, .bwidth = 2 * LV_STYLE_MULT, .bopa = 50,
.round = 4 * LV_STYLE_MULT, .objs.empty = 0,
.round = 4 * LV_STYLE_MULT, .empty = 0,
.hpad = 0, .vpad = 0 };
static lv_rects_t lv_rects_transp =
{ .bwidth = 0, .objs.empty = 0,
{ .bwidth = 0, .empty = 1,
.hpad = 0, .vpad = 0 };
static lv_rects_t lv_rects_border =
{ .bcolor = COLOR_BLACK, .bwidth = 2 * LV_STYLE_MULT, .bopa = 100,
.round = 4 * LV_STYLE_MULT, .objs.empty = 1,
.round = 4 * LV_STYLE_MULT, .empty = 1,
.hpad = 0, .vpad = 0};
/**********************
@@ -265,7 +265,7 @@ static bool lv_rect_design(lv_obj_t* obj_dp, const area_t * mask_p, lv_design_mo
{
/* Because of the radius it is not sure the area is covered*/
if(mode == LV_DESIGN_COVER_CHK) {
if(LV_SA(obj_dp, lv_rects_t)->objs.empty != 0) return false;
if(LV_SA(obj_dp, lv_rects_t)->empty != 0) return false;
uint16_t r = LV_SA(obj_dp, lv_rects_t)->round;
area_t area_tmp;