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

Minor bugfixes

Browse Source
This commit is contained in:
Gabor
2016-06-17 09:01:44 +02:00
parent c3ba6c7265
commit 35605d871d
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lv_draw/lv_draw.c
View File

@@ -202,7 +202,7 @@ void lv_draw_img(const area_t * cords_p, const area_t * mask_p,
lv_img_raw_header_t header;
res = fs_read(&file, &header, sizeof(lv_img_raw_header_t), &br);
uint32_t start_offset = 0;
uint32_t start_offset = sizeof(lv_img_raw_header_t);
start_offset += (area_get_width(cords_p) >> ds_shift) *
((mask_sub.y1 - cords_p->y1) >> ds_shift) * sizeof(color_t); /*First row*/
start_offset += ((mask_sub.x1 - cords_p->x1) >> ds_shift) * sizeof(color_t); /*First col*/

2
lv_obj/lv_obj.c
View File

@@ -34,7 +34,7 @@ lv_obj_t* def_scr_dp = NULL;
lv_obj_t* act_scr_dp = NULL;
ll_dsc_t scr_ll;
lv_objs_t lv_objs_def = {.color = COLOR_RED};
lv_objs_t lv_objs_def = {.color = COLOR_MAKE(0x20, 0x30, 0x40)};
lv_objs_t lv_objs_scr = {.color = LV_OBJ_DEF_SCR_COLOR};
/**********************

1
lv_objx/lv_btn.c
View File

@@ -419,7 +419,6 @@ static void lv_btn_style_load(lv_obj_t * obj_dp)
lv_btns_t * btns_p = lv_obj_get_style(obj_dp);
/*Init the style*/
lv_rects_get(LV_RECTS_DEF, &btns_p->rects);
btns_p->rects.objs.color = btns_p->mcolor[state];
btns_p->rects.gcolor = btns_p->gcolor[state];
btns_p->rects.bcolor = btns_p->bcolor[state];

2
lv_objx/lv_img.h
View File

@@ -63,7 +63,7 @@ lv_obj_t* lv_img_create(lv_obj_t* par_dp, lv_obj_t * copy_dp);
bool lv_img_signal(lv_obj_t* obj_dp, lv_signal_t sign, void * param);
void lv_img_set_file(lv_obj_t* obj_p, const char * fn);
fs_res_t lv_img_create_file(const char * fn, const color_int_t * data_p);
void lv_img_set_auto_size(lv_obj_t* obj_dp, bool mosaic_en);
void lv_img_set_auto_size(lv_obj_t* obj_dp, bool en);
bool lv_img_get_auto_size(lv_obj_t* obj_dp);

2
lv_objx/lv_line.c
View File

@@ -74,7 +74,7 @@ lv_obj_t* lv_line_create(lv_obj_t* par_dp, lv_obj_t * copy_dp)
ext_p->point_p = NULL;
ext_p->auto_size = 1;
ext_p->y_inv = 0;
ext_p->upscale = 1;
ext_p->upscale = 0;
lv_obj_set_style(new_obj_dp, &lv_lines_def);
}
/*Copy 'copy_p' is not NULL*/

23
lv_objx/lv_rect.c
View File

@@ -31,19 +31,19 @@ static bool lv_rect_design(lv_obj_t* obj_dp, const area_t * mask_p, lv_design_mo
* STATIC VARIABLES
**********************/
static lv_rects_t lv_rects_def =
{ .objs.color = COLOR_MAKE(0x50, 0x70, 0x90), .gcolor = COLOR_MAKE(0x20, 0x40, 0x60),
{ .objs.color = COLOR_MAKE(0x20, 0x30, 0x40), .gcolor = COLOR_MAKE(0x50, 0x70, 0x90),
.bcolor = COLOR_WHITE, .bwidth = 2 * LV_STYLE_MULT, .bopa = 50,
.round = 4 * LV_STYLE_MULT, .empty = 0,
.hpad = 0, .vpad = 0 };
.hpad = 0 * LV_STYLE_MULT, .vpad = 0 * LV_STYLE_MULT };
static lv_rects_t lv_rects_transp =
{ .bwidth = 0, .empty = 1,
.hpad = 0, .vpad = 0 };
.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, .empty = 1,
.hpad = 0, .vpad = 0};
.hpad = 10 * LV_STYLE_MULT, .vpad = 10 * LV_STYLE_MULT};
/**********************
* MACROS
@@ -100,7 +100,7 @@ bool lv_rect_signal(lv_obj_t* obj_dp, lv_signal_t sign, void * param)
/* Include the ancient signal function */
valid = lv_obj_signal(obj_dp, sign, param);
area_t rect_cords;
lv_rects_t * rests_p = lv_obj_get_style(obj_dp);
lv_rects_t * rects_p = lv_obj_get_style(obj_dp);
lv_rect_ext_t * ext_p = lv_obj_get_ext(obj_dp);
lv_obj_t * i;
@@ -130,16 +130,16 @@ bool lv_rect_signal(lv_obj_t* obj_dp, lv_signal_t sign, void * param)
/*If the value is not the init value then the page has >=1 child.*/
if(rect_cords.x1 != LV_CORD_MAX) {
if(rests_p->hpad != 0) {
rect_cords.x1 -= rests_p->hpad;
rect_cords.x2 += rests_p->hpad;
if(ext_p->hpad_en != 0) {
rect_cords.x1 -= rects_p->hpad;
rect_cords.x2 += rects_p->hpad;
} else {
rect_cords.x1 = obj_dp->cords.x1;
rect_cords.x2 = obj_dp->cords.x2;
}
if(rests_p->vpad != 0) {
rect_cords.y1 -= rests_p->vpad;
rect_cords.y2 += rests_p->vpad;
if(ext_p->vpad_en != 0) {
rect_cords.y1 -= rects_p->vpad;
rect_cords.y2 += rects_p->vpad;
} else {
rect_cords.y1 = obj_dp->cords.y1;
rect_cords.y2 = obj_dp->cords.y2;
@@ -174,6 +174,7 @@ bool lv_rect_signal(lv_obj_t* obj_dp, lv_signal_t sign, void * param)
*/
void lv_rect_set_pad_en(lv_obj_t * obj_dp, bool hor_en, bool ver_en)
{
lv_obj_inv(obj_dp);
lv_rect_ext_t * ext_p = lv_obj_get_ext(obj_dp);
ext_p->hpad_en = hor_en == false ? 0 : 1;
ext_p->vpad_en = ver_en == false ? 0 : 1;

5
lvgl.h
View File

@@ -20,8 +20,9 @@
/*********************
* DEFINES
*********************/
#define LV_GL_VERSION_MAJOR 1
#define LV_GL_VERSION_MINOR 1
#define LVGL_VERSION_MAJOR 1
#define LVGL_VERSION_MINOR 1
#define LVGL_VERSION_BUGFIX 1
/**********************
* TYPEDEFS