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

fix(align) fix LV_SIZE_CONTENT size calculation with not LEFT or TOP alignment

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-12-03 12:25:34 +01:00
parent d379804366
commit 9c676421ff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/lv_obj_pos.c
View File

@@ -968,8 +968,8 @@ static lv_coord_t calc_content_width(lv_obj_t * obj)
default:
/* Consider other cases only if x=0 and use the width of the object.
* With x!=0 circular dependency could occur. */
if(lv_obj_get_style_y(child, 0) == 0) {
child_res = LV_MAX(child_res, lv_area_get_width(&child->coords));
if(lv_obj_get_style_x(child, 0) == 0) {
child_res = LV_MAX(child_res, lv_area_get_width(&child->coords) + pad_right);
}
}
}
@@ -1001,7 +1001,7 @@ static lv_coord_t calc_content_width(lv_obj_t * obj)
/* Consider other cases only if x=0 and use the width of the object.
* With x!=0 circular dependency could occur. */
if(lv_obj_get_style_y(child, 0) == 0) {
child_res = LV_MAX(child_res, lv_area_get_width(&child->coords));
child_res = LV_MAX(child_res, lv_area_get_width(&child->coords) + pad_left);
}
}
}
@@ -1052,7 +1052,7 @@ static lv_coord_t calc_content_height(lv_obj_t * obj)
/* Consider other cases only if y=0 and use the height of the object.
* With y!=0 circular dependency could occur. */
if(lv_obj_get_style_y(child, 0) == 0) {
child_res = LV_MAX(child_res, lv_area_get_height(&child->coords));
child_res = LV_MAX(child_res, lv_area_get_height(&child->coords) + pad_top);
}
break;
}