Add console height setting (#5136)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 581eef31547a6f858282bb18dfd597027cf08fa2..c81dde7de2935d795d9f4436b98fdd992e36c24a 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -477,6 +477,9 @@ fall_bobbing_amount (Fall bobbing) float 0.0
 #    -    pageflip: quadbuffer based 3d.
 3d_mode (3D mode) enum none none,anaglyph,interlaced,topbottom,sidebyside,pageflip
 
+#    In-game chat console height, between 0.1 (10%) and 1.0 (100%).
+console_height (Console height) float 1.0 0.1 1.0
+
 #    In-game chat console background color (R,G,B).
 console_color (Console color) string (0,0,0)
 

diff --git a/minetest.conf.example b/minetest.conf.example
index 642b028c76ad4d1a96c3efc07d725977c2332dd7..5c7533e931b3aa73703572fb9948d9185dd46977 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -548,6 +548,10 @@
 #    type: enum values: none, anaglyph, interlaced, topbottom, sidebyside, pageflip
 # 3d_mode = none
 
+#    In-game chat console height, between 0.1 (10%) and 1.0 (100%).
+#    type: float
+# console_height = 1.0
+
 #    In-game chat console background color (R,G,B).
 #    type: string
 # console_color = (0,0,0)

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index e154a63c80548bb12c7ef78fafe05374e98ac166..84046f61c3a4af2b7a3de9715c796c85cb0e9e3e 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -138,6 +138,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("cloud_radius", "12");
        settings->setDefault("menu_clouds", "true");
        settings->setDefault("opaque_water", "false");
+       settings->setDefault("console_height", "1.0");
        settings->setDefault("console_color", "(0,0,0)");
        settings->setDefault("console_alpha", "200");
        settings->setDefault("selectionbox_color", "(0,0,0)");

diff --git a/src/game.cpp b/src/game.cpp
index 4b4597a7a35360e5e517682960853986ee73e09e..1cb054cabf5f18cffae07279781db98fa657ece9 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2627,7 +2627,8 @@ void Game::processKeyInput(VolatileRunFlags *flags,
        } else if (wasKeyDown(KeyType::CMD)) {
                openConsole(0.2, L"/");
        } else if (wasKeyDown(KeyType::CONSOLE)) {
-               openConsole(1);
+               openConsole(core::clamp(
+                       g_settings->getFloat("console_height"), 0.1f, 1.0f));
        } else if (wasKeyDown(KeyType::FREEMOVE)) {
                toggleFreeMove(statustext_time);
        } else if (wasKeyDown(KeyType::JUMP)) {