Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Persist menu textinput #13685

Merged
merged 2 commits into from
Aug 14, 2023
Merged

Persist menu textinput #13685

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91c8ce0
Persist text inputs in mainmenu local tab
archfan7411 Jun 20, 2023
27fd00d
Start game: Always use the current server port
Montandalar Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 15 additions & 3 deletions builtin/mainmenu/tab_local.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ local valid_disabled_settings = {
["enable_server"]=true,
}

-- Name and port stored to persist when updating the formspec
local current_name = core.settings:get("name")
local current_port = core.settings:get("port")

-- Currently chosen game in gamebar for theming and filtering
function current_game()
local last_game_id = core.settings:get("menu_last_game")
Expand Down Expand Up @@ -188,7 +192,7 @@ local function get_formspec(tabview, name, tabdata)
"checkbox[0,"..y..";cb_server_announce;" .. fgettext("Announce Server") .. ";" ..
dump(core.settings:get_bool("server_announce")) .. "]" ..
"field[0.3,2.85;3.8,0.5;te_playername;" .. fgettext("Name") .. ";" ..
core.formspec_escape(core.settings:get("name")) .. "]" ..
core.formspec_escape(current_name) .. "]" ..
"pwdfield[0.3,4.05;3.8,0.5;te_passwd;" .. fgettext("Password") .. "]"

local bind_addr = core.settings:get("bind_address")
Expand All @@ -197,11 +201,11 @@ local function get_formspec(tabview, name, tabdata)
"field[0.3,5.25;2.5,0.5;te_serveraddr;" .. fgettext("Bind Address") .. ";" ..
core.formspec_escape(core.settings:get("bind_address")) .. "]" ..
"field[2.85,5.25;1.25,0.5;te_serverport;" .. fgettext("Port") .. ";" ..
core.formspec_escape(core.settings:get("port")) .. "]"
core.formspec_escape(current_port) .. "]"
else
retval = retval ..
"field[0.3,5.25;3.8,0.5;te_serverport;" .. fgettext("Server Port") .. ";" ..
core.formspec_escape(core.settings:get("port")) .. "]"
core.formspec_escape(current_port) .. "]"
end
else
retval = retval ..
Expand All @@ -221,6 +225,14 @@ local function main_button_handler(this, fields, name, tabdata)

local world_doubleclick = false

if fields["te_playername"] then
current_name = fields["te_playername"]
end

if fields["te_serverport"] then
current_port = fields["te_serverport"]
end

if fields["sp_worlds"] ~= nil then
local event = core.explode_textlist_event(fields["sp_worlds"])
local selected = core.get_textlist_index("sp_worlds")
Expand Down