Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

lv_cont: PRETTY layout arrange proportionally if 2 objs. in a row

Browse Source
This commit is contained in:
Gabor 2017-07-27 13:45:37 +02:00
parent 78c5ad0cdb
commit 6cd9fda009
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lv_objx/lv_cont.c
View File

@ -1,5 +1,5 @@
/** /**
* @file lv_rect.c * @file lv_cont.c
* *
*/ */
@ -465,10 +465,19 @@ static void lv_cont_layout_pretty(lv_obj_t * cont)
h_row = lv_obj_get_height(child_rc); /*Not set previously because of the early break*/ h_row = lv_obj_get_height(child_rc); /*Not set previously because of the early break*/
} }
} }
/*If here is only one object in the row then align it to the middle*/ /*If there is only one object in the row then align it to the middle*/
else if (obj_num == 1) { else if (obj_num == 1) {
lv_obj_align(child_rs, cont, LV_ALIGN_IN_TOP_MID, 0, act_y); lv_obj_align(child_rs, cont, LV_ALIGN_IN_TOP_MID, 0, act_y);
} }
/*If are two object in the row then align them proportionally*/
else if (obj_num == 2) {
lv_obj_t * obj1 = child_rs;
lv_obj_t * obj2 = ll_get_prev(&cont->child_ll, child_rs);
w_row = lv_obj_get_width(obj1) + lv_obj_get_width(obj2);
cord_t pad = (w_obj - w_row) / 3;
lv_obj_align(obj1, cont, LV_ALIGN_IN_TOP_LEFT, pad, act_y);
lv_obj_align(obj2, cont, LV_ALIGN_IN_TOP_RIGHT, -pad, act_y);
}
/* Align the children (from child_rs to child_rc)*/ /* Align the children (from child_rs to child_rc)*/
else { else {
w_row -= style->opad * obj_num; w_row -= style->opad * obj_num;