From e74898a088438e96cc4e076d53354b5281277030 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Wed, 12 Feb 2020 13:32:15 +0100 Subject: [PATCH] MainMenu: fix background in world create and delete dialogs --- builtin/mainmenu/dlg_create_world.lua | 24 ++++++++++++------------ builtin/mainmenu/dlg_delete_world.lua | 14 +++++++------- textures/base/bg_common.png | Bin 299 -> 302 bytes textures/base/bg_dialog.png | Bin 192 -> 408 bytes 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index 661fe298..33334380 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -36,21 +36,21 @@ local function create_world_formspec() current_seed = core.formspec_escape(current_seed) local retval = - "size[11.5,3.75,false]" .. - "bgcolor[#8FB9DE]" .. - "background[0,0;11.5,3;" .. core.formspec_escape(defaulttexturedir .. + "size[12,6,false]" .. + "bgcolor[#00000000]" .. + "background[0,0;0,0;" .. core.formspec_escape(defaulttexturedir .. "bg_dialog.png") .. ";true]" .. - "label[1.5,0;" .. fgettext("World name:") .. "]".. - "field[4.5,0.4;6,0.5;te_world_name;;]" .. + "label[1.5,1.2;" .. fgettext("World name:") .. "]".. + "field[4.5,1.5;6,0.5;te_world_name;;]" .. - "label[1.5,1;" .. fgettext("Seed:") .. "]".. - "field[4.5,1.4;6,0.5;te_seed;;".. current_seed .. "]" .. + "label[1.5,2.2;" .. fgettext("Seed:") .. "]".. + "field[4.5,2.5;6,0.5;te_seed;;".. current_seed .. "]" .. - "label[1.5,2;" .. fgettext("Mapgen:") .. "]".. - "dropdown[4.2,2;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" .. + "label[1.5,3.2;" .. fgettext("Mapgen:") .. "]".. + "dropdown[4.2,3.05;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" .. - "button[3.25,3.4;2.5,0.5;world_create_confirm;" .. mt_green_button .. fgettext("Create") .. "]" .. - "button[5.75,3.4;2.5,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]" + "button[3.5,4.8;2.5,0.5;world_create_confirm;" .. mt_green_button .. fgettext("Create") .. "]" .. + "button[6,4.8;2.5,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]" return retval @@ -102,7 +102,7 @@ local function create_world_buttonhandler(this, fields) core.settings:set("menu_last_game", gamemgr.games[gameindex].id) return true end - + if fields["world_create_cancel"] then this:delete() return true diff --git a/builtin/mainmenu/dlg_delete_world.lua b/builtin/mainmenu/dlg_delete_world.lua index 8dd6b773..6f6167c6 100644 --- a/builtin/mainmenu/dlg_delete_world.lua +++ b/builtin/mainmenu/dlg_delete_world.lua @@ -18,14 +18,14 @@ local function delete_world_formspec(dialogdata) local retval = - "size[11.5,3.75,false]" .. - "bgcolor[#8FB9DE]" .. - "background[0,0;11.5,3;" .. core.formspec_escape(defaulttexturedir .. + "size[12,6,false]" .. + "bgcolor[#00000000]" .. + "background[0,0;0,0;" .. core.formspec_escape(defaulttexturedir .. "bg_dialog.png") .. ";true]" .. - "label[5,1.4;" .. fgettext("Delete World") .. "]" .. - "label[5,1.8;" .. fgettext("\"$1\"?", dialogdata.delete_name) .. "]" .. - "button[3.25,3.4;2.5,0.5;world_delete_confirm;" .. mt_red_button .. fgettext("Delete") .. "]" .. - "button[5.75,3.4;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]" + "label[5,2.4;" .. fgettext("Delete World") .. "]" .. + "label[5,2.8;" .. fgettext("\"$1\"?", dialogdata.delete_name) .. "]" .. + "button[3.5,4.8;2.5,0.5;world_delete_confirm;" .. mt_red_button .. fgettext("Delete") .. "]" .. + "button[6,4.8;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]" return retval end diff --git a/textures/base/bg_common.png b/textures/base/bg_common.png index 6206b77e7a15cfce2249fc206a16e21695d42983..03f987aa6b4ae98a39e31d6095ef11d5c9324216 100644 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0y~yU;;838JL)X)Q*2@Uw{-(fKP}kFSpo{JD-3&udo{3 z4^x)|S6$Gh9E#>j>nY^K@|xsbG9_SCO&7K%(WM|1&sft^5MypYn8Z45_&F_U=N#h5!NQgT^1yU-0{9E?;OYAkx6# z%P#m^D?)I-*56szTDD2$JI#G;!7Sl^eFu|F`1KvkGXA$U+3645XFcXiuyL$Ep!xrV j;_n&XTXszoXs@gNBGs+nc%qFJ=qm BN*w?I literal 192 zcmeAS@N?(olHy`uVBq!ia0y~yV3Y^4W0{zN3 zxf}Xl3@FZA666>B|3Aa^Q@oBqZi1(aV@L&Kl0;2|=@hL4jg7gY3v8`b7z7#?D%{%7 zWiq27PGiC0&dzeic{BcaYb~@+IQP7Ho$`zJWesT;H##Z^aIi2nI>4v^0S=Q^b`m1H}|jWwXaOpBBDD(oW*|u?PBnB^>bP0l+XkK&>TWG