From: Elijah Duffy <enduffy2014@outlook.com>
Date: Sat, 10 Jun 2017 18:14:26 +0000 (-0700)
Subject: Menu: Do not use textlist for shaders in settings tab (#5820)
X-Git-Tag: 5.0.0~1114
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a9f02ab51cd4b92a98d7b6dffe6d2838796ba9cc;p=oweals%2Fminetest.git

Menu: Do not use textlist for shaders in settings tab (#5820)

Replace the textlist used if the shaders checkbox is unchecked in the settings tab of the main menu with labels. This makes the formspec feel more consistent as the items do not move when shaders is unchecked but only change colour and the checkboxes beside them disappear.
---

diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua
index 5a8cc19b8..fada33335 100644
--- a/builtin/mainmenu/tab_settings.lua
+++ b/builtin/mainmenu/tab_settings.lua
@@ -247,17 +247,20 @@ local function formspec(tabview, name, tabdata)
 					.. dump(core.settings:get_bool("enable_waving_plants")) .. "]"
 	else
 		tab_string = tab_string ..
-			"tablecolumns[color;text]" ..
-			"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
-			"table[8.33,0.7;3.5,4;shaders;" ..
-				"#888888," .. fgettext("Bump Mapping") .. "," ..
-				"#888888," .. fgettext("Tone Mapping") .. "," ..
-				"#888888," .. fgettext("Normal Mapping") .. "," ..
-				"#888888," .. fgettext("Parallax Occlusion") .. "," ..
-				"#888888," .. fgettext("Waving Water") .. "," ..
-				"#888888," .. fgettext("Waving Leaves") .. "," ..
-				"#888888," .. fgettext("Waving Plants") .. "," ..
-				";1]"
+			"label[8.38,0.7;" .. core.colorize("#888888",
+					fgettext("Bump Mapping")) .. "]" ..
+			"label[8.38,1.2;" .. core.colorize("#888888",
+					fgettext("Tone Mapping")) .. "]" ..
+			"label[8.38,1.7;" .. core.colorize("#888888",
+					fgettext("Normal Mapping")) .. "]" ..
+			"label[8.38,2.2;" .. core.colorize("#888888",
+					fgettext("Parallax Occlusion")) .. "]" ..
+			"label[8.38,2.7;" .. core.colorize("#888888",
+					fgettext("Waving Water")) .. "]" ..
+			"label[8.38,3.2;" .. core.colorize("#888888",
+					fgettext("Waving Leaves")) .. "]" ..
+			"label[8.38,3.7;" .. core.colorize("#888888",
+					fgettext("Waving Plants")) .. "]"
 	end
 
 	return tab_string