Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2025-01-11 07:47:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Paramat 2018-12-06 23:52:11 +00:00 committed by GitHub
parent 0c6933bdf7
commit f0dca284b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/mainmenu/init.lua
View File

@ -25,9 +25,6 @@ mt_color_dark_green = "#25C191"
local menupath = core.get_mainmenu_path() local menupath = core.get_mainmenu_path()
local basepath = core.get_builtin_path() local basepath = core.get_builtin_path()
local menustyle = core.settings:get("main_menu_style") 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" .. defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
DIR_DELIM .. "pack" .. DIR_DELIM DIR_DELIM .. "pack" .. DIR_DELIM

3
builtin/settingtypes.txt
View File

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

2
src/defaultsettings.cpp
View File

@ -271,7 +271,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("joystick_frustum_sensitivity", "170"); settings->setDefault("joystick_frustum_sensitivity", "170");
// Main menu // Main menu
settings->setDefault("main_menu_style", "auto"); settings->setDefault("main_menu_style", "full");
settings->setDefault("main_menu_path", ""); settings->setDefault("main_menu_path", "");
settings->setDefault("serverlist_file", "favoriteservers.txt"); settings->setDefault("serverlist_file", "favoriteservers.txt");