Add crosshair support for Android (#7865)

[minetest.git] / builtin / mainmenu / tab_settings.lua

diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua
index 42f7f8daf9f267dde558722d21be62331b56db04..ec2d7b1f55138150beaf8093e553b18204997c0b 100644 (file)
--- a/builtin/mainmenu/tab_settings.lua
+++ b/builtin/mainmenu/tab_settings.lua
@@ -50,7 +50,7 @@ local labels = {
                fgettext("Low"),
                fgettext("Medium"),
                fgettext("High"),
-               fgettext("Ultra High")
+               fgettext("Very High")
        }
 }
 
@@ -160,7 +160,7 @@ local function formspec(tabview, name, tabdata)
                                .. getSettingIndex.NodeHighlighting() .. "]" ..
                "dropdown[0.25,3.6;3.5;dd_leaves_style;" .. dd_options.leaves[1] .. ";"
                                .. getSettingIndex.Leaves() .. "]" ..
-               "box[4,0;3.75,4.5;#999999]" ..
+               "box[4,0;3.75,4.9;#999999]" ..
                "label[4.25,0.1;" .. fgettext("Texturing:") .. "]" ..
                "dropdown[4.25,0.55;3.5;dd_filters;" .. dd_options.filters[1] .. ";"
                                .. getSettingIndex.Filter() .. "]" ..
@@ -169,9 +169,6 @@ local function formspec(tabview, name, tabdata)
                "label[4.25,2.15;" .. fgettext("Antialiasing:") .. "]" ..
                "dropdown[4.25,2.6;3.5;dd_antialiasing;" .. dd_options.antialiasing[1] .. ";"
                                .. getSettingIndex.Antialiasing() .. "]" ..
-               "label[4.25,3.45;" .. fgettext("Screen:") .. "]" ..
-               "checkbox[4.25,3.6;cb_autosave_screensize;" .. fgettext("Autosave Screen Size") .. ";"
-                               .. dump(core.settings:get_bool("autosave_screensize")) .. "]" ..
                "box[8,0;3.75,4.5;#999999]"
 
        local video_driver = core.settings:get("video_driver")
@@ -203,10 +200,15 @@ local function formspec(tabview, name, tabdata)
 
        if core.settings:get("touchscreen_threshold") ~= nil then
                tab_string = tab_string ..
-                       "label[4.3,4.2;" .. fgettext("Touchthreshold: (px)") .. "]" ..
-                       "dropdown[4.25,4.65;3.5;dd_touchthreshold;0,10,20,30,40,50;" ..
+                       "label[4.25,3.5;" .. fgettext("Touch threshold (px):") .. "]" ..
+                       "dropdown[4.25,3.95;3.5;dd_touchthreshold;0,10,20,30,40,50;" ..
                        ((tonumber(core.settings:get("touchscreen_threshold")) / 10) + 1) ..
-                       "]box[4.0,4.5;3.75,1.0;#999999]"
+                       "]"
+       else
+               tab_string = tab_string ..
+                       "label[4.25,3.65;" .. fgettext("Screen:") .. "]" ..
+                       "checkbox[4.25,3.9;cb_autosave_screensize;" .. fgettext("Autosave Screen Size") .. ";"
+                                       .. dump(core.settings:get_bool("autosave_screensize")) .. "]"
        end
 
        if shaders_enabled then
@@ -218,10 +220,19 @@ local function formspec(tabview, name, tabdata)
                        "checkbox[8.25,1.5;cb_waving_leaves;" .. fgettext("Waving Leaves") .. ";"
                                        .. dump(core.settings:get_bool("enable_waving_leaves")) .. "]" ..
                        "checkbox[8.25,2;cb_waving_plants;" .. fgettext("Waving Plants") .. ";"
-                                       .. dump(core.settings:get_bool("enable_waving_plants")) .. "]"..
-                       "label[8.25,3.0;" .. fgettext("Dynamic shadows: ") .. "]" ..
-                       "dropdown[8.25,3.5;3.5;dd_shadows;" .. dd_options.shadow_levels[1] .. ";"
+                                       .. dump(core.settings:get_bool("enable_waving_plants")) .. "]"
+
+               if video_driver == "opengl" then
+                       tab_string = tab_string ..
+                               "label[8.25,2.8;" .. fgettext("Dynamic shadows:") .. "]" ..
+                               "label[8.25,3.2;" .. fgettext("(game support required)") .. "]" ..
+                                       "dropdown[8.25,3.7;3.5;dd_shadows;" .. dd_options.shadow_levels[1] .. ";"
                                        .. getSettingIndex.ShadowMapping() .. "]"
+               else
+                       tab_string = tab_string ..
+                               "label[8.38,2.7;" .. core.colorize("#888888",
+                                       fgettext("Dynamic shadows")) .. "]"
+               end
        else
                tab_string = tab_string ..
                        "label[8.38,0.7;" .. core.colorize("#888888",
@@ -297,10 +308,6 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
                core.show_keys_menu()
                return true
        end
-       if fields["cb_touchscreen_target"] then
-               core.settings:set("touchtarget", fields["cb_touchscreen_target"])
-               return true
-       end
 
        --Note dropdowns have to be handled LAST!
        local ddhandled = false
@@ -364,11 +371,11 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
                core.settings:set("enable_dynamic_shadows", "false")
        else
                local shadow_presets = {
-                       [2] = { 80,  512,  "true", 0, "false" },
-                       [3] = { 120, 1024, "true", 1, "false" },
-                       [4] = { 350, 2048, "true", 1, "false" },
-                       [5] = { 350, 2048, "true", 2,  "true" },
-                       [6] = { 450, 4096, "true", 2,  "true" },
+                       [2] = { 62,  512,  "true", 0, "false" },
+                       [3] = { 93,  1024, "true", 0, "false" },
+                       [4] = { 140, 2048, "true", 1, "false" },
+                       [5] = { 210, 4096, "true", 2,  "true" },
+                       [6] = { 300, 8192, "true", 2,  "true" },
                }
                local s = shadow_presets[table.indexof(labels.shadow_levels, fields["dd_shadows"])]
                if s then