Skip to content

Commit a69bc67

Browse files
paramatparamat
authoredSep 29, 2020
Improve layout of main menu 'local' tab (#10366)
1 parent 995d405 commit a69bc67

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed
 

Diff for: ‎builtin/mainmenu/tab_local.lua

+16-17
Original file line numberDiff line numberDiff line change
@@ -114,45 +114,44 @@ local function get_formspec(tabview, name, tabdata)
114114
)
115115

116116
retval = retval ..
117-
"button[4,3.95;2.6,1;world_delete;".. fgettext("Delete") .. "]" ..
118-
"button[6.5,3.95;2.8,1;world_configure;".. fgettext("Configure") .. "]" ..
119-
"button[9.2,3.95;2.5,1;world_create;".. fgettext("New") .. "]" ..
120-
"label[4,-0.25;".. fgettext("Select World:") .. "]"..
121-
"checkbox[0.25,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
117+
"button[3.9,3.8;2.8,1;world_delete;".. fgettext("Delete") .. "]" ..
118+
"button[6.55,3.8;2.8,1;world_configure;".. fgettext("Configure") .. "]" ..
119+
"button[9.2,3.8;2.8,1;world_create;".. fgettext("New") .. "]" ..
120+
"label[3.9,-0.05;".. fgettext("Select World:") .. "]"..
121+
"checkbox[0,-0.20;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
122122
dump(core.settings:get_bool("creative_mode")) .. "]"..
123-
"checkbox[0.25,0.7;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
123+
"checkbox[0,0.25;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
124124
dump(core.settings:get_bool("enable_damage")) .. "]"..
125-
"checkbox[0.25,1.15;cb_server;".. fgettext("Host Server") ..";" ..
125+
"checkbox[0,0.7;cb_server;".. fgettext("Host Server") ..";" ..
126126
dump(core.settings:get_bool("enable_server")) .. "]" ..
127-
"textlist[4,0.25;7.5,3.7;sp_worlds;" ..
127+
"textlist[3.9,0.4;7.9,3.45;sp_worlds;" ..
128128
menu_render_worldlist() ..
129129
";" .. index .. "]"
130130

131131
if core.settings:get_bool("enable_server") then
132132
retval = retval ..
133-
"button[8.5,4.8;3.2,1;play;".. fgettext("Host Game") .. "]" ..
134-
"checkbox[0.25,1.6;cb_server_announce;" .. fgettext("Announce Server") .. ";" ..
133+
"button[7.9,4.75;4.1,1;play;".. fgettext("Host Game") .. "]" ..
134+
"checkbox[0,1.15;cb_server_announce;" .. fgettext("Announce Server") .. ";" ..
135135
dump(core.settings:get_bool("server_announce")) .. "]" ..
136-
"label[0.25,2.2;" .. fgettext("Name/Password") .. "]" ..
137-
"field[0.55,3.2;3.5,0.5;te_playername;;" ..
136+
"field[0.3,2.85;3.8,0.5;te_playername;" .. fgettext("Name") .. ";" ..
138137
core.formspec_escape(core.settings:get("name")) .. "]" ..
139-
"pwdfield[0.55,4;3.5,0.5;te_passwd;]"
138+
"pwdfield[0.3,4.05;3.8,0.5;te_passwd;" .. fgettext("Password") .. "]"
140139

141140
local bind_addr = core.settings:get("bind_address")
142141
if bind_addr ~= nil and bind_addr ~= "" then
143142
retval = retval ..
144-
"field[0.55,5.2;2.25,0.5;te_serveraddr;" .. fgettext("Bind Address") .. ";" ..
143+
"field[0.3,5.25;2.5,0.5;te_serveraddr;" .. fgettext("Bind Address") .. ";" ..
145144
core.formspec_escape(core.settings:get("bind_address")) .. "]" ..
146-
"field[2.8,5.2;1.25,0.5;te_serverport;" .. fgettext("Port") .. ";" ..
145+
"field[2.85,5.25;1.25,0.5;te_serverport;" .. fgettext("Port") .. ";" ..
147146
core.formspec_escape(core.settings:get("port")) .. "]"
148147
else
149148
retval = retval ..
150-
"field[0.55,5.2;3.5,0.5;te_serverport;" .. fgettext("Server Port") .. ";" ..
149+
"field[0.3,5.25;3.8,0.5;te_serverport;" .. fgettext("Server Port") .. ";" ..
151150
core.formspec_escape(core.settings:get("port")) .. "]"
152151
end
153152
else
154153
retval = retval ..
155-
"button[8.5,4.8;3.2,1;play;".. fgettext("Play Game") .. "]"
154+
"button[7.9,4.75;4.1,1;play;" .. fgettext("Play Game") .. "]"
156155
end
157156

158157
return retval

0 commit comments

Comments
 (0)