d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: do not output empty menu title

Browse Source 
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
This commit is contained in:
Toomas Soome 2021-04-21 14:42:10 +03:00
parent b563ff5d4f
commit 4ba91fa073
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stand/forth/menu.4th
View File

@ -490,7 +490,11 @@ also menu-infrastructure definitions
menuX @ 19 + over 2 / - menuY @ 1- menuX @ 19 + over 2 / - menuY @ 1-
then then
swap 1- swap 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 \ If $menu_init is set, evaluate it (allowing for whole menus to be
\ constructed dynamically -- as this function could conceivably set \ constructed dynamically -- as this function could conceivably set

3
stand/lua/drawer.lua
View File

@ -286,9 +286,12 @@ local function drawbox()
menu_header_x = x + (w // 2) - (#menu_header // 2) menu_header_x = x + (w // 2) - (#menu_header // 2)
end end
screen.setcursor(menu_header_x - 1, y) screen.setcursor(menu_header_x - 1, y)
if menu_header ~= "" then
printc(" " .. menu_header .. " ") printc(" " .. menu_header .. " ")
end end
end
local function drawbrand() local function drawbrand()
local x = tonumber(loader.getenv("loader_brand_x")) or local x = tonumber(loader.getenv("loader_brand_x")) or
brand_position.x brand_position.x