Main menu style: Set to 'full' for Android, remove 'auto' option (#7936)

diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index d959cd902411f0cb0f507b5ffc57322c9f68089e..8b8f3cd39ff9f409fc6dace6a11cf9d6edbddb72 100644 (file)
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -25,9 +25,6 @@ mt_color_dark_green = "#25C191"
 local menupath = core.get_mainmenu_path()
 local basepath = core.get_builtin_path()
 local menustyle = core.settings:get("main_menu_style")
-if menustyle == "auto" then
-       menustyle = PLATFORM == "Android" and "simple" or "full"
-end
 defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
                                        DIR_DELIM .. "pack" .. DIR_DELIM
 

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index dfe0d1ff05fd6eaa2334f43e5928c17028a057ae..40db037ea2529f5dacc000ab3cff1b81707f17d9 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1309,8 +1309,7 @@ high_precision_fpu (High-precision FPU) bool true
 #    -   Full:  Multple singleplayer worlds, game choice, texture pack chooser, etc.
 #    -   Simple: One singleplayer world, no game or texture pack choosers. May be
 #                necessary for smaller screens.
-#    -   Auto: Simple on Android, full on everything else.
-main_menu_style (Main menu style) enum auto auto,full,simple
+main_menu_style (Main menu style) enum full full,simple
 
 #    Replaces the default main menu with a custom one.
 main_menu_script (Main menu script) string

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 6a924b8408680760f5262ed4c8740ef51cb178b7..1ae6e046504127702e6439beb82bd7540362d38a 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -271,7 +271,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("joystick_frustum_sensitivity", "170");
 
        // Main menu
-       settings->setDefault("main_menu_style", "auto");
+       settings->setDefault("main_menu_style", "full");
        settings->setDefault("main_menu_path", "");
        settings->setDefault("serverlist_file", "favoriteservers.txt");