MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete world dialog: Move buttons to avoid double click deletion 

Move confirmation delete button to never overlap initial delete button,
to avoid world deletion by accidental double click.
master
Muhammad Rifqi Priyo Susanto 2017-09-30 00:50:42 +07:00 committed by paramat
parent cf98f5bbc0
commit 0f015b28a3
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
builtin/mainmenu/dlg_delete_world.lua
View File

@ -17,39 +17,36 @@
local function delete_world_formspec(dialogdata) local function delete_world_formspec(dialogdata)
local retval = local retval =
"size[11.5,4.5,true]" .. "size[10,2.5,true]" ..
"label[2,2;" .. "label[0.5,0.5;" ..
fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" .. fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" ..
"button[3.25,3.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" .. "button[0.5,1.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" ..
"button[5.75,3.5;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]" "button[7.0,1.5;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]"
return retval return retval
end end
local function delete_world_buttonhandler(this, fields) local function delete_world_buttonhandler(this, fields)
if fields["world_delete_confirm"] then if fields["world_delete_confirm"] then
if this.data.delete_index > 0 and if this.data.delete_index > 0 and
this.data.delete_index <= #menudata.worldlist:get_raw_list() then this.data.delete_index <= #menudata.worldlist:get_raw_list() then
core.delete_world(this.data.delete_index) core.delete_world(this.data.delete_index)
menudata.worldlist:refresh() menudata.worldlist:refresh()
end end
this:delete() this:delete()
return true return true
end end
if fields["world_delete_cancel"] then if fields["world_delete_cancel"] then
this:delete() this:delete()
return true return true
end end
return false return false
end end
function create_delete_world_dlg(name_to_del,index_to_del) function create_delete_world_dlg(name_to_del, index_to_del)
assert(name_to_del ~= nil and type(name_to_del) == "string" and name_to_del ~= "") assert(name_to_del ~= nil and type(name_to_del) == "string" and name_to_del ~= "")
assert(index_to_del ~= nil and type(index_to_del) == "number") assert(index_to_del ~= nil and type(index_to_del) == "number")
@ -59,6 +56,6 @@ function create_delete_world_dlg(name_to_del,index_to_del)
nil) nil)
retval.data.delete_name = name_to_del retval.data.delete_name = name_to_del
retval.data.delete_index = index_to_del retval.data.delete_index = index_to_del
return retval return retval
end end