From: Simon Glass <simon.glass@canonical.com> Move SCENEOBJT_TEXTEDIT after SCENEOBJT_TEXTLINE in the enum so it can be highlighted like other text-input objects. Update scene_obj_type_names array to match. Signed-off-by: Simon Glass <simon.glass@canonical.com> --- boot/scene.c | 2 +- include/expo.h | 2 +- test/boot/expo.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/scene.c b/boot/scene.c index 6b5c934a2e7..46bc9b64e64 100644 --- a/boot/scene.c +++ b/boot/scene.c @@ -38,9 +38,9 @@ static const char *const scene_obj_type_names[] = { "image", "text", "box", - "textedit", "menu", "textline", + "textedit", }; bool scene_chklog(const char *name) diff --git a/include/expo.h b/include/expo.h index c854d78255b..248f2363fe1 100644 --- a/include/expo.h +++ b/include/expo.h @@ -242,11 +242,11 @@ enum scene_obj_t { SCENEOBJT_IMAGE, SCENEOBJT_TEXT, SCENEOBJT_BOX, - SCENEOBJT_TEXTEDIT, /* types from here on can be highlighted */ SCENEOBJT_MENU, SCENEOBJT_TEXTLINE, + SCENEOBJT_TEXTEDIT, }; /** diff --git a/test/boot/expo.c b/test/boot/expo.c index 4febdf87cde..c8c97057d54 100644 --- a/test/boot/expo.c +++ b/test/boot/expo.c @@ -1254,7 +1254,7 @@ static int expo_scene_obj_type_name(struct unit_test_state *uts) ut_asserteq_str("textedit", scene_obj_type_name(SCENEOBJT_TEXTEDIT)); /* Test invalid type (out of range) */ - ut_asserteq_str("unknown", scene_obj_type_name(SCENEOBJT_TEXTLINE + 1)); + ut_asserteq_str("unknown", scene_obj_type_name(SCENEOBJT_TEXTEDIT + 1)); return 0; } -- 2.43.0