Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 01:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove formspec_default_bg_color/opacity settings (#13419)

Browse Source 
These settings are unnecessary. They only apply when formspecs don't have a background/bgcolor set. In practice, most games do theme their GUIs. Removing low value settings simplifies code and improves UX by decluttering the settings menu

Split out from #12140
This commit is contained in:
rubenwardy 2023-04-11 19:57:36 +01:00 committed by GitHub
parent 1dd13da37d
commit 2fc7eb3ea2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/settingtypes.txt
View File

@ -2109,12 +2109,6 @@ noclip (Noclip) bool false
# Press the autoforward key again or the backwards movement to disable. # Press the autoforward key again or the backwards movement to disable.
continuous_forward (Continuous forward) bool false continuous_forward (Continuous forward) bool false
# Formspec default background opacity (between 0 and 255).
formspec_default_bg_opacity (Formspec Default Background Opacity) int 140 0 255
# Formspec default background color (R,G,B).
formspec_default_bg_color (Formspec Default Background Color) string (0,0,0)
# Whether to show technical names. # Whether to show technical names.
# Affects mods and texture packs in the Content and Select Mods menus, as well as # Affects mods and texture packs in the Content and Select Mods menus, as well as
# setting names in All Settings. # setting names in All Settings.

9
minetest.conf.example
View File

@ -3233,14 +3233,6 @@
# type: bool # type: bool
# continuous_forward = false # continuous_forward = false
# Formspec default background opacity (between 0 and 255).
# type: int min: 0 max: 255
# formspec_default_bg_opacity = 140
# Formspec default background color (R,G,B).
# type: string
# formspec_default_bg_color = (0,0,0)
# Whether to show technical names. # Whether to show technical names.
# Affects mods and texture packs in the Content and Select Mods menus, as well as # Affects mods and texture packs in the Content and Select Mods menus, as well as
# setting names in All Settings. # setting names in All Settings.
@ -3611,4 +3603,3 @@
# See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h # See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h
# type: key # type: key
# keymap_decrease_viewing_range_min = - # keymap_decrease_viewing_range_min = -

2
src/defaultsettings.cpp
View File

@ -220,8 +220,6 @@ void set_default_settings()
settings->setDefault("console_alpha", "200"); settings->setDefault("console_alpha", "200");
settings->setDefault("formspec_fullscreen_bg_color", "(0,0,0)"); settings->setDefault("formspec_fullscreen_bg_color", "(0,0,0)");
settings->setDefault("formspec_fullscreen_bg_opacity", "140"); settings->setDefault("formspec_fullscreen_bg_opacity", "140");
settings->setDefault("formspec_default_bg_color", "(0,0,0)");
settings->setDefault("formspec_default_bg_opacity", "140");
settings->setDefault("selectionbox_color", "(0,0,0)"); settings->setDefault("selectionbox_color", "(0,0,0)");
settings->setDefault("selectionbox_width", "2"); settings->setDefault("selectionbox_width", "2");
settings->setDefault("node_highlighting", "box"); settings->setDefault("node_highlighting", "box");

11
src/gui/guiFormSpecMenu.cpp
View File

@ -3090,16 +3090,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
m_bgfullscreen = false; m_bgfullscreen = false;
m_formspec_version = 1; m_formspec_version = 1;
m_bgcolor = video::SColor(140, 0, 0, 0);
{
v3f formspec_bgcolor = g_settings->getV3F("formspec_default_bg_color");
m_bgcolor = video::SColor(
(u8) clamp_u8(g_settings->getS32("formspec_default_bg_opacity")),
clamp_u8(myround(formspec_bgcolor.X)),
clamp_u8(myround(formspec_bgcolor.Y)),
clamp_u8(myround(formspec_bgcolor.Z))
);
}
{ {
v3f formspec_bgcolor = g_settings->getV3F("formspec_fullscreen_bg_color"); v3f formspec_bgcolor = g_settings->getV3F("formspec_fullscreen_bg_color");