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

fix(obj_pos) consider all alignements in contnt size calculation but only if x and y = 0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-10-21 12:20:00 +02:00
parent 76c8ee6b7e
commit 5b27ebb409
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/lv_obj_pos.c
View File

@@ -960,6 +960,12 @@ static lv_coord_t calc_content_width(lv_obj_t * obj)
/*Normal right aligns. Other are ignored due to possible circular dependencies*/ /*Normal right aligns. Other are ignored due to possible circular dependencies*/
child_res = LV_MAX(child_res, obj->coords.x2 - child->coords.x1 + 1); child_res = LV_MAX(child_res, obj->coords.x2 - child->coords.x1 + 1);
break; break;
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));
}
} }
} else { } else {
child_res = LV_MAX(child_res, obj->coords.x2 - child->coords.x1 + 1); child_res = LV_MAX(child_res, obj->coords.x2 - child->coords.x1 + 1);
@@ -982,9 +988,15 @@ static lv_coord_t calc_content_width(lv_obj_t * obj)
case LV_ALIGN_TOP_LEFT: case LV_ALIGN_TOP_LEFT:
case LV_ALIGN_BOTTOM_LEFT: case LV_ALIGN_BOTTOM_LEFT:
case LV_ALIGN_LEFT_MID: case LV_ALIGN_LEFT_MID:
/*Normal left aligns. Other are ignored due to possible circular dependencies*/ /*Normal left aligns.*/
child_res = LV_MAX(child_res, child->coords.x2 - obj->coords.x1 + 1); child_res = LV_MAX(child_res, child->coords.x2 - obj->coords.x1 + 1);
break; break;
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));
}
} }
} else { } else {
child_res = LV_MAX(child_res, child->coords.x2 - obj->coords.x1 + 1); child_res = LV_MAX(child_res, child->coords.x2 - obj->coords.x1 + 1);
@@ -1026,9 +1038,16 @@ static lv_coord_t calc_content_height(lv_obj_t * obj)
case LV_ALIGN_TOP_RIGHT: case LV_ALIGN_TOP_RIGHT:
case LV_ALIGN_TOP_MID: case LV_ALIGN_TOP_MID:
case LV_ALIGN_TOP_LEFT: case LV_ALIGN_TOP_LEFT:
/*Normal top aligns. Other are ignored due to possible circular dependencies*/ /*Normal top aligns. */
child_res = LV_MAX(child_res, child->coords.y2 - obj->coords.y1 + 1); child_res = LV_MAX(child_res, child->coords.y2 - obj->coords.y1 + 1);
break; break;
default:
/* 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));
}
break;
} }
} else { } else {
child_res = LV_MAX(child_res, child->coords.y2 - obj->coords.y1 + 1); child_res = LV_MAX(child_res, child->coords.y2 - obj->coords.y1 + 1);