summaryrefslogtreecommitdiff
path: root/builtin/mainmenu
diff options
context:
space:
mode:
authorElijah Duffy <enduffy2014@outlook.com>2017-06-10 11:14:26 -0700
committerSmallJoker <SmallJoker@users.noreply.github.com>2017-06-10 20:14:26 +0200
commita9f02ab51cd4b92a98d7b6dffe6d2838796ba9cc (patch)
treec1f62203d3f1757b2d8acf6643df30db229c2507 /builtin/mainmenu
parent25ae0739ed70be8b6a46bdc98aee4b7e33f478ab (diff)
downloadminetest-a9f02ab51cd4b92a98d7b6dffe6d2838796ba9cc.tar.gz
minetest-a9f02ab51cd4b92a98d7b6dffe6d2838796ba9cc.tar.bz2
minetest-a9f02ab51cd4b92a98d7b6dffe6d2838796ba9cc.zip
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.
Diffstat (limited to 'builtin/mainmenu')
-rw-r--r--builtin/mainmenu/tab_settings.lua25
1 files changed, 14 insertions, 11 deletions
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