Skip to content

Commit 0f015b2

Browse files
srifqiparamat
authored andcommitted
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.
1 parent cf98f5b commit 0f015b2

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

builtin/mainmenu/dlg_delete_world.lua

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,36 @@
1717

1818

1919
local function delete_world_formspec(dialogdata)
20-
2120
local retval =
22-
"size[11.5,4.5,true]" ..
23-
"label[2,2;" ..
21+
"size[10,2.5,true]" ..
22+
"label[0.5,0.5;" ..
2423
fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" ..
25-
"button[3.25,3.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" ..
26-
"button[5.75,3.5;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]"
24+
"button[0.5,1.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" ..
25+
"button[7.0,1.5;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]"
2726
return retval
2827
end
2928

3029
local function delete_world_buttonhandler(this, fields)
3130
if fields["world_delete_confirm"] then
32-
3331
if this.data.delete_index > 0 and
34-
this.data.delete_index <= #menudata.worldlist:get_raw_list() then
32+
this.data.delete_index <= #menudata.worldlist:get_raw_list() then
3533
core.delete_world(this.data.delete_index)
3634
menudata.worldlist:refresh()
3735
end
3836
this:delete()
3937
return true
4038
end
41-
39+
4240
if fields["world_delete_cancel"] then
4341
this:delete()
4442
return true
4543
end
46-
44+
4745
return false
4846
end
4947

5048

51-
function create_delete_world_dlg(name_to_del,index_to_del)
52-
49+
function create_delete_world_dlg(name_to_del, index_to_del)
5350
assert(name_to_del ~= nil and type(name_to_del) == "string" and name_to_del ~= "")
5451
assert(index_to_del ~= nil and type(index_to_del) == "number")
5552

@@ -59,6 +56,6 @@ function create_delete_world_dlg(name_to_del,index_to_del)
5956
nil)
6057
retval.data.delete_name = name_to_del
6158
retval.data.delete_index = index_to_del
62-
59+
6360
return retval
6461
end

0 commit comments

Comments
 (0)