From patchwork Sat Oct 18 08:41:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 615 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1760776943; bh=uQStoiVuvuFXf078g4XIx9PlKb9H+FMIcJSjNiLKNxY=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=hyZofZVQz5OTA3bgVUiipiWIQ21Gd/zfKocQyzu4Tnq3ZU5fsxpaKewvSsIG2SFOd t5dFD+1I4m+PODzJ3ldChem7lsdZUqHWdsAlyscb43hcp9J/wxwypsEFveDVbnUMme rteorrMx4c7BpRQmL+LGHq5bPYA58JMHZGIyOF8QBlF/Jke32pluMOZW3Rn6hOwkfE M4h365X/IEO8zZvFSh6QcvSGQMNN1CqX6cdfSSShijbyOFWaZGPO3rHkbPaJuU1IYa Gy27kyHDN99J4f2+i9iV4ve8ks+Z1yu++73JSDmeowcfVBEZH3Z6wbk1a3GUcYLQTY 0e9xY7K1gp2bA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id E476E681CD for ; Sat, 18 Oct 2025 02:42:23 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id IfHefQDYPPyq for ; Sat, 18 Oct 2025 02:42:23 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1760776943; bh=uQStoiVuvuFXf078g4XIx9PlKb9H+FMIcJSjNiLKNxY=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=hyZofZVQz5OTA3bgVUiipiWIQ21Gd/zfKocQyzu4Tnq3ZU5fsxpaKewvSsIG2SFOd t5dFD+1I4m+PODzJ3ldChem7lsdZUqHWdsAlyscb43hcp9J/wxwypsEFveDVbnUMme rteorrMx4c7BpRQmL+LGHq5bPYA58JMHZGIyOF8QBlF/Jke32pluMOZW3Rn6hOwkfE M4h365X/IEO8zZvFSh6QcvSGQMNN1CqX6cdfSSShijbyOFWaZGPO3rHkbPaJuU1IYa Gy27kyHDN99J4f2+i9iV4ve8ks+Z1yu++73JSDmeowcfVBEZH3Z6wbk1a3GUcYLQTY 0e9xY7K1gp2bA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D2EA96819D for ; Sat, 18 Oct 2025 02:42:23 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1760776942; bh=+ib3QLly4btp9n8fqGN/iZ27XptDbOdXn7l266QQk6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WDH47LByCtHd/kgvBVlCoHBRirifw//rsdX6mmkvWkJmFoOzl4CRCJv5hB7MnFcaj vPuA8wWcfF1A1gO0j92yxXfW9AHXXoKd2WUTpLKGD60c4ZZ4msZiVdIMzM+SMffpLc GLwhJbBEzsgcp51PW0R9/gh36Dfy7DnLGge5XsXjbvAVAE7uOZe3b/Sqef92dCEs/W OMbTuFX0NE7Vy96hHWdcdxxR0cMA1KMJxErEtkf7zKJAp26kUqF+YcROT5OQOUVzXR LNBXhTlKcfJI7VjRbLp6IK9eRGTR/T0quzvuJCmRgOESbMPzknc5oumLDVGsnpb1bH APK1rpbQWFufg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 9A5A1681BB; Sat, 18 Oct 2025 02:42:22 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id NWJdJBIooo4W; Sat, 18 Oct 2025 02:42:22 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1760776942; bh=0YfrQtXNfCnnwkBRdjGvt8LLkkXMppaJzoiWlSR4Ktc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IxlkIe9kQ+f4utBDA8rpoJALXs5XuleN4rOuFflIWUkcIL6sHrVCpZt4+kC8P+S2D 3YqWdsmkYHXSycgyJg6DgwSVwA4hYmabIPjhdKGd5vSsinOu8MS0ZPQur/LOdyu1uR Vx8WngtJKo1zw8jp46xlQLVQ3Ai0oedkhaG1Jvz+RMCJj2a/dPOHqwwF+BO5nfkPfX DZwS9KoTY78oYy8EIegjzPbYKGXviNAJ8/mEmhf2wdbLgumf3IaY47ZrbAkwmO5XJg jZ4Sa8OzgHqEFYSfiPNd0kxYNn+5UbmxXZKpzKhdVy+K4mpFRUqku8MdZrit0ecIx9 s+MKOvzlP82Jg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id D20236814E; Sat, 18 Oct 2025 02:42:21 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Sat, 18 Oct 2025 02:41:01 -0600 Message-ID: <20251018084117.1798704-17-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251018084117.1798704-1-sjg@u-boot.org> References: <20251018084117.1798704-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: N6XF4VPZMP7MK6R3SXKLCWQORH7U2CYW X-Message-ID-Hash: N6XF4VPZMP7MK6R3SXKLCWQORH7U2CYW X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 16/24] bootctl: Re-apply the theme when showing the UI List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass If a different UI is used then the theme may have changed, so re-apply the theme when showing the UI. Signed-off-by: Simon Glass --- boot/bootctl/simple_ui.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/boot/bootctl/simple_ui.c b/boot/bootctl/simple_ui.c index 3ef00651c05..7fb59c8b8c3 100644 --- a/boot/bootctl/simple_ui.c +++ b/boot/bootctl/simple_ui.c @@ -60,6 +60,7 @@ static int simple_ui_show(struct udevice *dev) { struct bc_ui_priv *upriv = dev_get_uclass_priv(dev); struct logic_priv *lpriv = upriv->lpriv; + struct expo_theme *theme; struct bootstd_priv *std; struct scene *scn; struct abuf *buf; @@ -107,6 +108,12 @@ static int simple_ui_show(struct udevice *dev) if (ret) return log_msg_ret("thm", ret); } + theme = &upriv->expo->theme; + theme->white_on_black = true; + + ret = expo_apply_theme(upriv->expo, true); + if (ret) + return log_msg_ret("asn", ret); ret = scene_arrange(scn); if (ret) @@ -144,11 +151,11 @@ static int simple_ui_add(struct udevice *dev, struct osinfo *info) ret = bootstd_get_priv(&std); if (ret) return log_msg_ret("sup", ret); - if (ofnode_valid(std->theme)) { - ret = expo_setup_theme(upriv->expo, std->theme); - if (ret) - return log_msg_ret("thm", ret); - } + + ret = expo_apply_theme(upriv->expo, true); + if (ret) + return log_msg_ret("asn", ret); + ret = expo_calc_dims(upriv->expo); if (ret) return log_msg_ret("ecd", ret);