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

Optimizatzon of signal sending, child_chg_off added as lv_obj attribute

Browse Source
This commit is contained in:
Gabor
2016-06-22 15:16:08 +02:00
parent d987f08be9
commit 451a30cf07
5 changed files with 67 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lv_obj/lv_obj.c
View File

@@ -306,9 +306,12 @@ bool lv_obj_signal(lv_obj_t* obj_dp, lv_signal_t sign, void * param)
{ {
bool valid = true; bool valid = true;
switch(sign) { switch(sign) {
case LV_SIGNAL_CHILD_CHG: case LV_SIGNAL_CHILD_CHG:
lv_obj_refr_layout(obj_dp); if(obj_dp->child_chg_off != 0) valid = false;
else lv_obj_refr_layout(obj_dp);
break; break;
case LV_SIGNAL_CORD_CHG: case LV_SIGNAL_CORD_CHG:
if(param == NULL) if(param == NULL)
@@ -395,12 +398,14 @@ void lv_obj_set_parent(lv_obj_t* obj_dp, lv_obj_t* parent_dp)
ll_chg_list(&obj_dp->par_dp->child_ll, &parent_dp->child_ll, obj_dp); ll_chg_list(&obj_dp->par_dp->child_ll, &parent_dp->child_ll, obj_dp);
/*Notify the original parent because one of its children is lost*/
obj_dp->par_dp->signal_f(obj_dp->par_dp, LV_SIGNAL_CHILD_CHG, NULL); obj_dp->par_dp->signal_f(obj_dp->par_dp, LV_SIGNAL_CHILD_CHG, NULL);
obj_dp->par_dp = parent_dp; obj_dp->par_dp = parent_dp;
lv_obj_set_pos(obj_dp, old_pos.x, old_pos.y); lv_obj_set_pos(obj_dp, old_pos.x, old_pos.y);
/*Notify the new parent about the child*/
parent_dp->signal_f(parent_dp, LV_SIGNAL_CHILD_CHG, obj_dp); parent_dp->signal_f(parent_dp, LV_SIGNAL_CHILD_CHG, obj_dp);
@@ -419,13 +424,6 @@ void lv_obj_set_parent(lv_obj_t* obj_dp, lv_obj_t* parent_dp)
*/ */
void lv_obj_set_pos(lv_obj_t* obj_dp, cord_t x, cord_t y) void lv_obj_set_pos(lv_obj_t* obj_dp, cord_t x, cord_t y)
{ {
/*Invalidate the original area*/
lv_obj_inv(obj_dp);
/*Save the original coordinates*/
area_t ori;
lv_obj_get_cords(obj_dp, &ori);
/*Convert x and y to absolute coordinates*/ /*Convert x and y to absolute coordinates*/
lv_obj_t* par_dp = obj_dp->par_dp; lv_obj_t* par_dp = obj_dp->par_dp;
x = x + par_dp->cords.x1; x = x + par_dp->cords.x1;
@@ -436,9 +434,18 @@ void lv_obj_set_pos(lv_obj_t* obj_dp, cord_t x, cord_t y)
diff.x = x - obj_dp->cords.x1; diff.x = x - obj_dp->cords.x1;
diff.y = y - obj_dp->cords.y1; diff.y = y - obj_dp->cords.y1;
/*Do nothing if the position is not changed*/ /* Do nothing if the position is not changed */
/* It is very important else recursive positioning can
* occur without position change*/
if(diff.x == 0 && diff.y == 0) return; if(diff.x == 0 && diff.y == 0) return;
/*Invalidate the original area*/
lv_obj_inv(obj_dp);
/*Save the original coordinates*/
area_t ori;
lv_obj_get_cords(obj_dp, &ori);
obj_dp->cords.x1 += diff.x; obj_dp->cords.x1 += diff.x;
obj_dp->cords.y1 += diff.y; obj_dp->cords.y1 += diff.y;
obj_dp->cords.x2 += diff.x; obj_dp->cords.x2 += diff.x;
@@ -446,7 +453,7 @@ void lv_obj_set_pos(lv_obj_t* obj_dp, cord_t x, cord_t y)
lv_obj_pos_child_refr(obj_dp, diff.x, diff.y); lv_obj_pos_child_refr(obj_dp, diff.x, diff.y);
/*Send a signal*/ /*Inform the object about its new coordinates*/
obj_dp->signal_f(obj_dp, LV_SIGNAL_CORD_CHG, &ori); obj_dp->signal_f(obj_dp, LV_SIGNAL_CORD_CHG, &ori);
/*Send a signal to the parent too*/ /*Send a signal to the parent too*/
@@ -518,6 +525,14 @@ void lv_obj_set_y_us(lv_obj_t* obj_dp, cord_t y)
*/ */
void lv_obj_set_size(lv_obj_t* obj_dp, cord_t w, cord_t h) void lv_obj_set_size(lv_obj_t* obj_dp, cord_t w, cord_t h)
{ {
/* Do nothing if the size is not changed */
/* It is very important else recursive resizing can
* occur without size change*/
if(lv_obj_get_width(obj_dp) == w && lv_obj_get_height(obj_dp) == h) {
return;
}
/*Invalidate the original area*/ /*Invalidate the original area*/
lv_obj_inv(obj_dp); lv_obj_inv(obj_dp);
@@ -529,7 +544,8 @@ void lv_obj_set_size(lv_obj_t* obj_dp, cord_t w, cord_t h)
obj_dp->cords.x2 = obj_dp->cords.x1 + w - 1; obj_dp->cords.x2 = obj_dp->cords.x1 + w - 1;
obj_dp->cords.y2 = obj_dp->cords.y1 + h - 1; obj_dp->cords.y2 = obj_dp->cords.y1 + h - 1;
/*Send a signal*/
/*Send a signal to the object with its new coordinates*/
obj_dp->signal_f(obj_dp, LV_SIGNAL_CORD_CHG, &ori); obj_dp->signal_f(obj_dp, LV_SIGNAL_CORD_CHG, &ori);
/*Send a signal to the parent too*/ /*Send a signal to the parent too*/
@@ -600,6 +616,8 @@ void lv_obj_set_height_us(lv_obj_t* obj_dp, cord_t h)
void lv_obj_set_layout(lv_obj_t* obj_dp, lv_layout_t layout) void lv_obj_set_layout(lv_obj_t* obj_dp, lv_layout_t layout)
{ {
obj_dp->layout_type = layout; obj_dp->layout_type = layout;
/*Send signal to refresh the layout*/
obj_dp->signal_f(obj_dp, LV_SIGNAL_CHILD_CHG, NULL); obj_dp->signal_f(obj_dp, LV_SIGNAL_CHILD_CHG, NULL);
} }
@@ -611,6 +629,8 @@ void lv_obj_set_layout(lv_obj_t* obj_dp, lv_layout_t layout)
void lv_obj_set_layout_space(lv_obj_t * obj_dp, cord_t space) void lv_obj_set_layout_space(lv_obj_t * obj_dp, cord_t space)
{ {
obj_dp->layout_space = space; obj_dp->layout_space = space;
/*Send signal to refresh the layout*/
obj_dp->signal_f(obj_dp, LV_SIGNAL_CHILD_CHG, NULL); obj_dp->signal_f(obj_dp, LV_SIGNAL_CHILD_CHG, NULL);
} }
@@ -756,14 +776,10 @@ void lv_obj_align(lv_obj_t* obj_dp,lv_obj_t* base_dp, lv_align_t align, cord_t x
cord_t par_abs_y = par_dp->cords.y1; cord_t par_abs_y = par_dp->cords.y1;
new_x += x_mod + base_abs_x; new_x += x_mod + base_abs_x;
new_y += y_mod + base_abs_y; new_y += y_mod + base_abs_y;
if(new_x != obj_dp->cords.x1 || new_y != obj_dp->cords.y1) {
new_x -= par_abs_x; new_x -= par_abs_x;
new_y -= par_abs_y; new_y -= par_abs_y;
lv_obj_set_pos(obj_dp, new_x, new_y); lv_obj_set_pos(obj_dp, new_x, new_y);
}
} }
@@ -795,10 +811,10 @@ void lv_obj_set_style(lv_obj_t* obj_dp, void * style_p)
if(obj_dp->style_iso != 0) { if(obj_dp->style_iso != 0) {
dm_free(obj_dp->style_p); dm_free(obj_dp->style_p);
} }
obj_dp->style_p = style_p; obj_dp->style_p = style_p;
/*Send a style change signal to the object*/
obj_dp->signal_f(obj_dp, LV_SIGNAL_STYLE_CHG, NULL); obj_dp->signal_f(obj_dp, LV_SIGNAL_STYLE_CHG, NULL);
//obj_dp->signal_f(lv_obj_get_parent(obj_dp, )
lv_obj_inv(obj_dp); lv_obj_inv(obj_dp);
} }
@@ -1396,7 +1412,7 @@ static void lv_layout_col(lv_obj_t * obj_dp)
} }
if(obj_cnt == 0) return; if(obj_cnt == 0) return;
space = lv_obj_get_height(parent_dp) - h_tot; space = lv_obj_get_height(obj_dp) - h_tot;
if(obj_cnt == 5) { if(obj_cnt == 5) {
obj_cnt = 5; obj_cnt = 5;
@@ -1426,11 +1442,18 @@ static void lv_layout_col(lv_obj_t * obj_dp)
break; break;
} }
/* Disable child change action because the children will be moved a lot
* an unnecessary child change signals could be sent*/
obj_dp->child_chg_off = 1;
/* Align the children */
cord_t last_cord = space / 2; cord_t last_cord = space / 2;
LL_READ_BACK(obj_dp->child_ll, child) { LL_READ_BACK(obj_dp->child_ll, child) {
lv_obj_align(child, parent_dp, align, margin , last_cord); lv_obj_align(child, obj_dp, align, margin , last_cord);
last_cord += lv_obj_get_height(child) + space; last_cord += lv_obj_get_height(child) + space;
} }
obj_dp->child_chg_off = 0;
} }
/** /**
@@ -1479,10 +1502,17 @@ static void lv_layout_row(lv_obj_t * obj_dp)
break; break;
} }
/* Disable child change action because the children will be moved a lot
* an unnecessary child change signals could be sent*/
obj_dp->child_chg_off = 1;
/* Align the children */
cord_t last_cord = space / 2; cord_t last_cord = space / 2;
LL_READ_BACK(obj_dp->child_ll, child) { LL_READ_BACK(obj_dp->child_ll, child) {
lv_obj_align(child, obj_dp, align, last_cord, margin); lv_obj_align(child, obj_dp, align, last_cord, margin);
last_cord += lv_obj_get_width(child) + space; last_cord += lv_obj_get_width(child) + space;
} }
obj_dp->child_chg_off = 0;
} }

2
lv_obj/lv_obj.h
View File

@@ -113,7 +113,7 @@ typedef struct __LV_OBJ_T
uint8_t style_iso :1; /*1: The object has got an own style*/ uint8_t style_iso :1; /*1: The object has got an own style*/
uint8_t hidden :1; /*1: Object is hidden*/ uint8_t hidden :1; /*1: Object is hidden*/
uint8_t top_en :1; /*1: If the object or its children is clicked it goes to the foreground*/ uint8_t top_en :1; /*1: If the object or its children is clicked it goes to the foreground*/
uint8_t res :1; uint8_t child_chg_off:1; /*1: Disable the child change signal. Useful when moving the children*/
opa_t opa; opa_t opa;

8
lv_objx/lv_btn.c
View File

@@ -60,8 +60,8 @@ static lv_btns_t lv_btns_def =
.rects.bopa = 50, .rects.bopa = 50,
.rects.empty = 0, .rects.empty = 0,
.rects.round = 4 * LV_STYLE_MULT, .rects.round = 4 * LV_STYLE_MULT,
.rects.hpad = 14 * LV_STYLE_MULT, .rects.hpad = 10 * LV_STYLE_MULT,
.rects.vpad = 10 * LV_STYLE_MULT, .rects.vpad = 15 * LV_STYLE_MULT,
}; };
static lv_btns_t lv_btns_transp = static lv_btns_t lv_btns_transp =
{ {
@@ -122,8 +122,8 @@ lv_obj_t* lv_btn_create(lv_obj_t* par_dp, lv_obj_t * copy_dp)
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_dp, &lv_btns_def); lv_obj_set_style(new_obj_dp, &lv_btns_def);
lv_obj_set_layout(new_obj_dp, LV_LAYOUT_ROW_M); lv_obj_set_layout(new_obj_dp, LV_LAYOUT_COL_M);
lv_obj_set_layout_space_us(new_obj_dp, 10); /*Justified align*/ lv_obj_set_layout_space_us(new_obj_dp, -40); /*Justified align*/
} }
/*Copy 'copy_dp'*/ /*Copy 'copy_dp'*/
else{ else{

3
lv_objx/lv_label.c
View File

@@ -207,9 +207,6 @@ void lv_label_set_text(lv_obj_t * obj_dp, const char * text)
lv_obj_set_height(obj_dp, new_height); lv_obj_set_height(obj_dp, new_height);
} }
lv_obj_t * parent_dp = lv_obj_get_parent(obj_dp);
parent_dp->signal_f(parent_dp, LV_SIGNAL_CHILD_CHG, obj_dp);
lv_obj_inv(obj_dp); lv_obj_inv(obj_dp);
} }

13
lv_objx/lv_rect.c
View File

@@ -100,6 +100,7 @@ bool lv_rect_signal(lv_obj_t* obj_dp, lv_signal_t sign, void * param)
/* Include the ancient signal function */ /* Include the ancient signal function */
valid = lv_obj_signal(obj_dp, sign, param); valid = lv_obj_signal(obj_dp, sign, param);
area_t rect_cords; area_t rect_cords;
area_t ori;
lv_rects_t * rects_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_rect_ext_t * ext_p = lv_obj_get_ext(obj_dp);
lv_obj_t * i; lv_obj_t * i;
@@ -150,7 +151,9 @@ bool lv_rect_signal(lv_obj_t* obj_dp, lv_signal_t sign, void * param)
} }
/*Search the side coordinates of the children*/ /*Search the side coordinates of the children*/
lv_obj_get_cords(obj_dp, &ori);
lv_obj_get_cords(obj_dp, &rect_cords); lv_obj_get_cords(obj_dp, &rect_cords);
rect_cords.x1 = LV_CORD_MAX; rect_cords.x1 = LV_CORD_MAX;
rect_cords.y1 = LV_CORD_MAX; rect_cords.y1 = LV_CORD_MAX;
rect_cords.x2 = LV_CORD_MIN; rect_cords.x2 = LV_CORD_MIN;
@@ -179,13 +182,16 @@ bool lv_rect_signal(lv_obj_t* obj_dp, lv_signal_t sign, void * param)
rect_cords.y1 = obj_dp->cords.y1; rect_cords.y1 = obj_dp->cords.y1;
rect_cords.y2 = obj_dp->cords.y2; rect_cords.y2 = obj_dp->cords.y2;
} }
area_cpy(&obj_dp->cords, &rect_cords); area_cpy(&obj_dp->cords, &rect_cords);
lv_obj_set_pos(obj_dp, lv_obj_get_x(obj_dp), /*Notify the object about its new coordinates*/
lv_obj_get_y(obj_dp)); obj_dp->signal_f(obj_dp, LV_SIGNAL_CORD_CHG, &ori);
/*Inform the parent about the new coordinates*/
lv_obj_t * par_dp = lv_obj_get_parent(obj_dp); lv_obj_t * par_dp = lv_obj_get_parent(obj_dp);
par_dp->signal_f(par_dp, LV_SIGNAL_CHILD_CHG, obj_dp); par_dp->signal_f(par_dp, LV_SIGNAL_CHILD_CHG, obj_dp);
} else { } else {
lv_obj_set_size(obj_dp, LV_OBJ_DEF_WIDTH, LV_OBJ_DEF_HEIGHT); lv_obj_set_size(obj_dp, LV_OBJ_DEF_WIDTH, LV_OBJ_DEF_HEIGHT);
} }
@@ -217,8 +223,7 @@ void lv_rect_set_pad_en(lv_obj_t * obj_dp, bool hor_en, bool ver_en)
ext_p->hpad_en = hor_en == false ? 0 : 1; ext_p->hpad_en = hor_en == false ? 0 : 1;
ext_p->vpad_en = ver_en == false ? 0 : 1; ext_p->vpad_en = ver_en == false ? 0 : 1;
obj_dp->signal_f(obj_dp, LV_SIGNAL_STYLE_CHG, obj_dp); /*Send a signal to run the paddig calculations*/
lv_obj_t * par_dp = lv_obj_get_parent(obj_dp); lv_obj_t * par_dp = lv_obj_get_parent(obj_dp);
par_dp->signal_f(par_dp, LV_SIGNAL_CHILD_CHG, obj_dp); par_dp->signal_f(par_dp, LV_SIGNAL_CHILD_CHG, obj_dp);
} }