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

lv_btn style loading bugfux

Browse Source
This commit is contained in:
Kiss-Vamosi Gabor
2016-06-22 17:31:04 +02:00
parent 35605d871d
commit 659a641c5a
2 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lv_objx/lv_btn.c
View File

@@ -25,7 +25,7 @@
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
static bool lv_btn_design(lv_obj_t* obj_dp, const area_t * mask_p, lv_design_mode_t mode); static bool lv_btn_design(lv_obj_t* obj_dp, const area_t * mask_p, lv_design_mode_t mode);
static void lv_btn_style_load(lv_obj_t * obj_dp); static void lv_btn_style_load(lv_obj_t * obj_dp, lv_rects_t * rects_p);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
@@ -102,15 +102,15 @@ static lv_btns_t lv_btns_border =
*/ */
lv_obj_t* lv_btn_create(lv_obj_t* par_dp, lv_obj_t * copy_dp) lv_obj_t* lv_btn_create(lv_obj_t* par_dp, lv_obj_t * copy_dp)
{ {
lv_obj_t* new_obj; lv_obj_t* new_obj_dp;
new_obj = lv_rect_create(par_dp, copy_dp); new_obj_dp = lv_rect_create(par_dp, copy_dp);
/*Allocate the extended data*/ /*Allocate the extended data*/
lv_obj_alloc_ext(new_obj, sizeof(lv_btn_ext_t)); lv_obj_alloc_ext(new_obj_dp, sizeof(lv_btn_ext_t));
lv_obj_set_signal_f(new_obj, lv_btn_signal); lv_obj_set_signal_f(new_obj_dp, lv_btn_signal);
lv_obj_set_design_f(new_obj, lv_btn_design); lv_obj_set_design_f(new_obj_dp, lv_btn_design);
lv_btn_ext_t * btn_ext_dp = lv_obj_get_ext(new_obj); lv_btn_ext_t * btn_ext_dp = lv_obj_get_ext(new_obj_dp);
btn_ext_dp->lpr_exec = 0; btn_ext_dp->lpr_exec = 0;
/*If no copy do the basic initialization*/ /*If no copy do the basic initialization*/
@@ -121,7 +121,7 @@ lv_obj_t* lv_btn_create(lv_obj_t* par_dp, lv_obj_t * copy_dp)
btn_ext_dp->rel_action = NULL; btn_ext_dp->rel_action = NULL;
btn_ext_dp->lpr_action = NULL; btn_ext_dp->lpr_action = NULL;
btn_ext_dp->tgl = 0; btn_ext_dp->tgl = 0;
lv_obj_set_style(new_obj, &lv_btns_def); lv_obj_set_style(new_obj_dp, &lv_btns_def);
} }
/*Copy 'copy_dp'*/ /*Copy 'copy_dp'*/
else{ else{
@@ -133,7 +133,7 @@ lv_obj_t* lv_btn_create(lv_obj_t* par_dp, lv_obj_t * copy_dp)
btn_ext_dp->tgl = ori_btn_ext->tgl; btn_ext_dp->tgl = ori_btn_ext->tgl;
} }
return new_obj; return new_obj_dp;
} }
/** /**
@@ -146,11 +146,6 @@ bool lv_btn_signal(lv_obj_t * obj_dp, lv_signal_t sign, void* param)
{ {
bool valid; bool valid;
/*Be sure the corresponding style is loaded*/
if(sign == LV_SIGNAL_STYLE_CHG) {
lv_btn_style_load(obj_dp);
}
/* Include the ancient signal function */ /* Include the ancient signal function */
valid = lv_rect_signal(obj_dp, sign, param); valid = lv_rect_signal(obj_dp, sign, param);
@@ -223,10 +218,6 @@ bool lv_btn_signal(lv_obj_t * obj_dp, lv_signal_t sign, void* param)
valid = btn_ext_dp->lpr_action(obj_dp, param); valid = btn_ext_dp->lpr_action(obj_dp, param);
} }
break; break;
case LV_SIGNAL_STYLE_CHG:
/*Load the currently active style*/
lv_btn_style_load(obj_dp);
break;
default: default:
/*Do nothing*/ /*Do nothing*/
break; break;
@@ -262,7 +253,6 @@ void lv_btn_set_state(lv_obj_t* obj_dp, lv_btn_state_t state)
lv_btn_ext_t * btn_p = lv_obj_get_ext(obj_dp); lv_btn_ext_t * btn_p = lv_obj_get_ext(obj_dp);
btn_p->state = state; btn_p->state = state;
lv_btn_style_load(obj_dp);
lv_obj_inv(obj_dp); lv_obj_inv(obj_dp);
} }
@@ -403,8 +393,12 @@ static bool lv_btn_design(lv_obj_t* obj_dp, const area_t * mask_p, lv_design_mod
area_t area; area_t area;
lv_obj_get_cords(obj_dp, &area); lv_obj_get_cords(obj_dp, &area);
lv_rects_t rects_tmp;
lv_btn_style_load(obj_dp, &rects_tmp);
/*Draw the rectangle*/ /*Draw the rectangle*/
lv_draw_rect(&area, mask_p, &btns_p->rects, opa); lv_draw_rect(&area, mask_p, &rects_tmp, opa);
return true; return true;
} }
@@ -413,15 +407,16 @@ static bool lv_btn_design(lv_obj_t* obj_dp, const area_t * mask_p, lv_design_mod
* Load the corresponding style according to the state to 'rects' in 'lv_btns_t' * Load the corresponding style according to the state to 'rects' in 'lv_btns_t'
* @param obj_dp pointer to a button object * @param obj_dp pointer to a button object
*/ */
static void lv_btn_style_load(lv_obj_t * obj_dp) static void lv_btn_style_load(lv_obj_t * obj_dp, lv_rects_t * rects_p)
{ {
lv_btn_state_t state = lv_btn_get_state(obj_dp); lv_btn_state_t state = lv_btn_get_state(obj_dp);
lv_btns_t * btns_p = lv_obj_get_style(obj_dp); lv_btns_t * btns_p = lv_obj_get_style(obj_dp);
/*Init the style*/ /*Load the style*/
btns_p->rects.objs.color = btns_p->mcolor[state]; memcpy(rects_p, &btns_p->rects, sizeof(lv_rects_t));
btns_p->rects.gcolor = btns_p->gcolor[state]; rects_p->objs.color = btns_p->mcolor[state];
btns_p->rects.bcolor = btns_p->bcolor[state]; rects_p->gcolor = btns_p->gcolor[state];
rects_p->bcolor = btns_p->bcolor[state];
} }
#endif #endif

2
lvgl.h
View File

@@ -22,7 +22,7 @@
*********************/ *********************/
#define LVGL_VERSION_MAJOR 1 #define LVGL_VERSION_MAJOR 1
#define LVGL_VERSION_MINOR 1 #define LVGL_VERSION_MINOR 1
#define LVGL_VERSION_BUGFIX 1 #define LVGL_VERSION_BUGFIX 2
/********************** /**********************
* TYPEDEFS * TYPEDEFS