diff mbox series

[Concept,25/27] expo: Mark textedits as highlightable

Message ID	20260119204130.3972647-26-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Mon, 19 Jan 2026 13:41:18 -0700 Message-ID: <20260119204130.3972647-26-sjg@u-boot.org> In-Reply-To: <20260119204130.3972647-1-sjg@u-boot.org> References: <20260119204130.3972647-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 432JQ3QZMW7C3NGTI72KV2C5VBDM5ZTR CC: Simon Glass <simon.glass@canonical.com> Precedence: list Subject: [Concept] [PATCH 25/27] expo: Mark textedits as highlightable Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/432JQ3QZMW7C3NGTI72KV2C5VBDM5ZTR/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	Expo debugging and textedit improvements (part E) \| [Concept,00/27] Expo debugging and textedit improvements (part E) [Concept,01/27] hook: Add hooks for kaka [Concept,02/27] test/py: Allow --help without a build directory [Concept,03/27] proftool: Fix funcgraph depth for exit records [Concept,04/27] test: trace: Remove stale trace file before saving [Concept,05/27] test: trace: Fix funcgraph check for matching exit indent [Concept,06/27] pickman: Handle qconfig resync commits specially [Concept,07/27] sandbox: test: Add bootph-all to pinctrl-single for serial [Concept,08/27] test: dm: rtc: Fix flaky dm_test_rtc_dual test [Concept,09/27] video: Log each measured line with log_content() [Concept,10/27] sandbox: Add grid-drawing option to sandbox_sdl_sync() [Concept,11/27] sandbox: Add 'sb grid' command to enable grid overlay [Concept,12/27] sandbox: Allow grid size to be specified in 'sb grid' command [Concept,13/27] sandbox: log: Add file log driver [Concept,14/27] expo: Use a configurable output function in expo_dump() [Concept,15/27] expo: Dump the line-measurement info [Concept,16/27] expo: Add debug logging to scene_txtin_arrange() [Concept,17/27] sandbox: expo: Add expo_dump_file() [Concept,18/27] expo: Add scene_chklog() for filtered logging [Concept,19/27] expo: Fix textedit word-wrap measurement order [Concept,20/27] expo: Add per-line measurement logging [Concept,21/27] expo: Add a txtin function to render dependencies [Concept,22/27] expo: Combine textline and textedit switch cases [Concept,23/27] expo: Add scene_txtin_open() for common text-input open code [Concept,24/27] expo: Add scene_txtin_close() for common text-input close code [Concept,25/27] expo: Mark textedits as highlightable [Concept,26/27] expo: Fix textedit height calculation [Concept,27/27] expo: Render textedit dependencies correctly

Commit Message

Simon Glass Jan. 19, 2026, 8:41 p.m. UTC

  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 mbox series

Patch

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;
 }