smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expo: Set up the width and height of objects

Browse Source 
Provide a way to set the full dimensions of objects, i.e. including the
width and height.

For menus, calculate the bounding box of all objects in the menu. Set all
labels to be the same size, so that highlighting works correct, once
implemented.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-06-01 10:22:52 -06:00
committed by Tom Rini
parent 50f0203759
commit 699b0acb52
7 changed files with 239 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test/boot/expo.c
View File

@@ -473,6 +473,48 @@ static int expo_render_image(struct unit_test_state *uts)
/* render without a scene */
ut_asserteq(-ECHILD, expo_render(exp));
ut_assertok(expo_calc_dims(exp));
ut_assertok(scene_arrange(scn));
/* check dimensions of text */
obj = scene_obj_find(scn, OBJ_TEXT, SCENEOBJT_NONE);
ut_assertnonnull(obj);
ut_asserteq(400, obj->dim.x);
ut_asserteq(100, obj->dim.y);
ut_asserteq(126, obj->dim.w);
ut_asserteq(40, obj->dim.h);
/* check dimensions of image */
obj = scene_obj_find(scn, OBJ_LOGO, SCENEOBJT_NONE);
ut_assertnonnull(obj);
ut_asserteq(50, obj->dim.x);
ut_asserteq(20, obj->dim.y);
ut_asserteq(160, obj->dim.w);
ut_asserteq(160, obj->dim.h);
/* check dimensions of menu labels - both should be the same width */
obj = scene_obj_find(scn, ITEM1_LABEL, SCENEOBJT_NONE);
ut_assertnonnull(obj);
ut_asserteq(50, obj->dim.x);
ut_asserteq(436, obj->dim.y);
ut_asserteq(29, obj->dim.w);
ut_asserteq(18, obj->dim.h);
obj = scene_obj_find(scn, ITEM2_LABEL, SCENEOBJT_NONE);
ut_assertnonnull(obj);
ut_asserteq(50, obj->dim.x);
ut_asserteq(454, obj->dim.y);
ut_asserteq(29, obj->dim.w);
ut_asserteq(18, obj->dim.h);
/* check dimensions of menu */
obj = scene_obj_find(scn, OBJ_MENU, SCENEOBJT_NONE);
ut_assertnonnull(obj);
ut_asserteq(50, obj->dim.x);
ut_asserteq(400, obj->dim.y);
ut_asserteq(160, obj->dim.w);
ut_asserteq(160, obj->dim.h);
/* render it */
expo_set_scene_id(exp, SCENE1);
ut_assertok(expo_render(exp));