]> git.lizzy.rs Git - minetest.git/commitdiff
Mainmenu: don't show change keys dialog on android
authorest31 <MTest31@outlook.com>
Fri, 13 May 2016 00:22:31 +0000 (02:22 +0200)
committerparamat <mat.gregory@virginmedia.com>
Fri, 13 May 2016 16:30:53 +0000 (17:30 +0100)
The change keys dialog can't be left. It doesn't make
much sense to show it on Android in the first place,
therefore disable it, just like commit

aed70cb0b652d6cb2272e7b94cd56671b3df6239 'Disable sound and key binding settings in "pause" menu on android'

has disabled it for the esc menu.

Fixes #4115.

builtin/mainmenu/tab_settings.lua

index 2649a8a579f96ab401bb5666652672c9931a4ee4..b9f2453abbb745a5f62e957c008152b1e13aec44 100644 (file)
@@ -203,9 +203,15 @@ local function formspec(tabview, name, tabdata)
                "checkbox[8,0;cb_shaders;" .. fgettext("Shaders") .. ";"
                                .. dump(core.setting_getbool("enable_shaders")) .. "]"
 
+       if PLATFORM ~= "Android" then
+               tab_string = tab_string ..
+                       "button[8,4.75;3.75,0.5;btn_change_keys;"
+                       .. fgettext("Change keys") .. "]"
+       end
+
        tab_string = tab_string ..
-               "button[8,4.75;3.75,0.5;btn_change_keys;" .. fgettext("Change keys") .. "]" ..
-               "button[0,4.75;3.75,0.5;btn_advanced_settings;" .. fgettext("Advanced Settings") .. "]"
+               "button[0,4.75;3.75,0.5;btn_advanced_settings;"
+               .. fgettext("Advanced Settings") .. "]"
 
 
        if core.setting_get("touchscreen_threshold") ~= nil then