The branch main has been updated by tsoome:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4ba91fa0736bb0672d475b6b56d9e7b06e78ff69
commit 4ba91fa0736bb0672d475b6b56d9e7b06e78ff69
Author: Toomas Soome <tso...@freebsd.org>
AuthorDate: 2021-04-21 11:42:10 +0000
Commit: Toomas Soome <tso...@freebsd.org>
CommitDate: 2021-04-21 11:50:23 +0000
loader: do not output empty menu title
As we output spaces around the menu title, we should also check,
if the title is actually empty string.
PR: 255299
Submitted by: Jose Luis Duran
Reported by: Jose Luis Duran
MFC after: 1 week
---
stand/forth/menu.4th | 6 +++++-
stand/lua/drawer.lua | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/stand/forth/menu.4th b/stand/forth/menu.4th
index a336b9f9e7aa..75e75e3e3654 100644
--- a/stand/forth/menu.4th
+++ b/stand/forth/menu.4th
@@ -490,7 +490,11 @@ also menu-infrastructure definitions
menuX @ 19 + over 2 / - menuY @ 1-
then
swap 1- swap
- at-xy space type space
+ at-xy dup 0= if
+ 2drop ( empty loader_menu_title )
+ else
+ space type space
+ then
\ If $menu_init is set, evaluate it (allowing for whole menus to be
\ constructed dynamically -- as this function could conceivably set
diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua
index 523735a75d06..6324c2262c11 100644
--- a/stand/lua/drawer.lua
+++ b/stand/lua/drawer.lua
@@ -286,7 +286,10 @@ local function drawbox()
menu_header_x = x + (w // 2) - (#menu_header // 2)
end
screen.setcursor(menu_header_x - 1, y)
- printc(" " .. menu_header .. " ")
+ if menu_header ~= "" then
+ printc(" " .. menu_header .. " ")
+ end
+
end
local function drawbrand()
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
