Mainmenu: Brighter text colours for readability

[dragonfireclient.git] / builtin / mainmenu / tab_singleplayer.lua

diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua
index 4ae4dde3595b19977e85af0140cf931743c95763..236de763c9b1f73fe4da79329853282fbae2ff29 100644 (file)
--- a/builtin/mainmenu/tab_singleplayer.lua
+++ b/builtin/mainmenu/tab_singleplayer.lua
@@ -40,10 +40,13 @@ local function singleplayer_refresh_gamebar()
                                        menudata.worldlist:set_filtercriteria(gamemgr.games[j].id)
                                        local index = filterlist.get_current_index(menudata.worldlist,
                                                tonumber(core.setting_get("mainmenu_last_selected_world")))
-                                       local selected = core.get_textlist_index("sp_worlds")
                                        if not index or index < 1 then
-                                               index = math.min(core.get_textlist_index("sp_worlds"),
-                                                       #menudata.worldlist:get_list())
+                                               local selected = core.get_textlist_index("sp_worlds")
+                                               if selected ~= nil and selected < #menudata.worldlist:get_list() then
+                                                       index = selected
+                                               else
+                                                       index = #menudata.worldlist:get_list()
+                                               end
                                        end
                                        menu_worldmt_legacy(index)
                                        return true
@@ -54,7 +57,7 @@ local function singleplayer_refresh_gamebar()
 
        local btnbar = buttonbar_create("game_button_bar",
                game_buttonbar_button_handler,
-               {x=-0.3,y=5.65}, "horizontal", {x=12.4,y=1.15})
+               {x=-0.3,y=5.9}, "horizontal", {x=12.4,y=1.15})
 
        for i=1,#gamemgr.games,1 do
                local btn_name = "game_btnbar_" .. gamemgr.games[i].id
@@ -93,7 +96,7 @@ local function get_formspec(tabview, name, tabdata)
                        "button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
                        "button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
                        "button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
-                       "button[8.5,4.95;3.25,0.5;play;".. fgettext("Play") .. "]" ..
+                       "button[8.5,5;3.25,0.5;play;".. fgettext("Play") .. "]" ..
                        "label[4,-0.25;".. fgettext("Select World:") .. "]"..
                        "checkbox[0.25,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
                        dump(core.setting_getbool("creative_mode")) .. "]"..
@@ -238,10 +241,10 @@ local function on_change(type, old_tab, new_tab)
 end
 
 --------------------------------------------------------------------------------
-tab_singleplayer = {
+return {
        name = "singleplayer",
        caption = fgettext("Singleplayer"),
        cbf_formspec = get_formspec,
        cbf_button_handler = main_button_handler,
        on_change = on_change
-       }
+}