From adde4084b8f8e1d1b5de106009558fce86b4e408 Mon Sep 17 00:00:00 2001 From: jp Date: Sun, 18 Jan 2015 12:29:33 +0100 Subject: [PATCH] Fix style on settings tab --- builtin/mainmenu/tab_settings.lua | 61 +++++++++++++++++-------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index bc27da87e..0ad23062f 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -128,35 +128,35 @@ local function formspec(tabview, name, tabdata) end end -local filters = { - {"No Filter,Bilinear Filter,Trilinear Filter"}, - {"", "bilinear_filter", "trilinear_filter"}, -} + local filters = { + {"No Filter,Bilinear Filter,Trilinear Filter"}, + {"", "bilinear_filter", "trilinear_filter"}, + } -local mipmap = { - {"No Mipmap,Mipmap,Mipmap + Aniso. Filter"}, - {"", "mip_map", "anisotropic_filter"}, -} + local mipmap = { + {"No Mipmap,Mipmap,Mipmap + Aniso. Filter"}, + {"", "mip_map", "anisotropic_filter"}, + } -local function getFilterSettingIndex() - if (core.setting_get(filters[2][3]) == "true") then - return 3 - end - if (core.setting_get(filters[2][3]) == "false" and core.setting_get(filters[2][2]) == "true") then - return 2 - end - return 1 -end + local function getFilterSettingIndex() + if (core.setting_get(filters[2][3]) == "true") then + return 3 + end + if (core.setting_get(filters[2][3]) == "false" and core.setting_get(filters[2][2]) == "true") then + return 2 + end + return 1 + end -local function getMipmapSettingIndex() - if (core.setting_get(mipmap[2][3]) == "true") then - return 3 - end - if (core.setting_get(mipmap[2][3]) == "false" and core.setting_get(mipmap[2][2]) == "true") then - return 2 - end - return 1 -end + local function getMipmapSettingIndex() + if (core.setting_get(mipmap[2][3]) == "true") then + return 3 + end + if (core.setting_get(mipmap[2][3]) == "false" and core.setting_get(mipmap[2][2]) == "true") then + return 2 + end + return 1 + end local tab_string = "box[0,0;3.5,3.9;#999999]" .. @@ -241,7 +241,8 @@ end "textlist[8.33,2.2;4,1;;#888888" .. fgettext("Waving Water") .. ";0;true]" .. "textlist[8.33,2.7;4,1;;#888888" .. fgettext("Waving Leaves") .. ";0;true]" .. "textlist[8.33,3.2;4,1;;#888888" .. fgettext("Waving Plants") .. ";0;true]" - end + end + return tab_string end @@ -343,26 +344,32 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) if fields["dd_filters"] == "No Filter" then core.setting_set("bilinear_filter", "false") core.setting_set("trilinear_filter", "false") + ddhandled = true end if fields["dd_filters"] == "Bilinear Filter" then core.setting_set("bilinear_filter", "true") core.setting_set("trilinear_filter", "false") + ddhandled = true end if fields["dd_filters"] == "Trilinear Filter" then core.setting_set("bilinear_filter", "false") core.setting_set("trilinear_filter", "true") + ddhandled = true end if fields["dd_mipmap"] == "No Mipmap" then core.setting_set("mip_map", "false") core.setting_set("anisotropic_filter", "false") + ddhandled = true end if fields["dd_mipmap"] == "Mipmap" then core.setting_set("mip_map", "true") core.setting_set("anisotropic_filter", "false") + ddhandled = true end if fields["dd_mipmap"] == "Mipmap + Aniso. Filter" then core.setting_set("mip_map", "true") core.setting_set("anisotropic_filter", "true") + ddhandled = true end return ddhandled