diff options
| author | rubenwardy <rw@rubenwardy.com> | 2023-04-11 19:57:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 19:57:36 +0100 |
| commit | 2fc7eb3ea26af60feadc182a9d469d630314665b (patch) | |
| tree | f1879bb03d42f33f2e09cd0b921819742a5f89bf /src | |
| parent | 1dd13da37db32972810b942966d5cdd233215f92 (diff) | |
| download | minetest-2fc7eb3ea26af60feadc182a9d469d630314665b.tar.xz | |
Remove formspec_default_bg_color/opacity settings (#13419)
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaultsettings.cpp | 2 | ||||
| -rw-r--r-- | src/gui/guiFormSpecMenu.cpp | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index f7a32ee2e..9d883f7c1 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -220,8 +220,6 @@ void set_default_settings() settings->setDefault("console_alpha", "200"); settings->setDefault("formspec_fullscreen_bg_color", "(0,0,0)"); 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_width", "2"); settings->setDefault("node_highlighting", "box"); diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index aed765ed8..16183211d 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -3090,16 +3090,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize) m_bgfullscreen = false; m_formspec_version = 1; - - { - 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)) - ); - } + m_bgcolor = video::SColor(140, 0, 0, 0); { v3f formspec_bgcolor = g_settings->getV3F("formspec_fullscreen_bg_color"); |