minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Formspec: Add options to set background color and opacity (fullscreen mode)

This commit is contained in:
JPG 2017-02-25 15:06:04 +01:00
parent 4d634ef675
commit efdfa991d7
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/settingtypes.txt
View File

@ -486,6 +486,12 @@ console_color (Console color) string (0,0,0)
# In-game chat console background alpha (opaqueness, between 0 and 255).
console_alpha (Console alpha) int 200 0 255
# Formspec full-screen background opacity (between 0 and 255).
formspec_fullscreen_bg_opacity (Formspec Full-Screen Background Opacity) int 140 0 255
# Formspec full-screen background color (R,G,B).
formspec_fullscreen_bg_color (Formspec Full-Screen Background Color) string (0,0,0)
# Selection box border color (R,G,B).
selectionbox_color (Selection box color) string (0,0,0)

8
minetest.conf.example
View File

@ -560,6 +560,14 @@
# type: int min: 0 max: 255
# console_alpha = 200
# Formspec full-screen background opacity (between 0 and 255).
# type: int
# formspec_fullscreen_bg_opacity = 140
# Formspec full-screen background color (R,G,B).
# type: string
# formspec_fullscreen_bg_color = (0,0,0)
# Selection box border color (R,G,B).
# type: string
# selectionbox_color = (0,0,0)

2
src/defaultsettings.cpp
View File

@ -141,6 +141,8 @@ void set_default_settings(Settings *settings)
settings->setDefault("console_height", "1.0");
settings->setDefault("console_color", "(0,0,0)");
settings->setDefault("console_alpha", "200");
settings->setDefault("formspec_fullscreen_bg_color", "(0,0,0)");
settings->setDefault("formspec_fullscreen_bg_opacity", "140");
settings->setDefault("selectionbox_color", "(0,0,0)");
settings->setDefault("selectionbox_width", "2");
settings->setDefault("node_highlighting", "box");

20
src/guiFormSpecMenu.cpp
View File

@ -78,6 +78,11 @@ static unsigned int font_line_height(gui::IGUIFont *font)
return font->getDimension(L"Ay").Height + font->getKerningHeight();
}
inline u32 clamp_u8(s32 value)
{
return (u32) MYMIN(MYMAX(value, 0), 255);
}
GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
JoystickController *joystick,
gui::IGUIElement* parent, s32 id, IMenuManager *menumgr,
@ -2390,11 +2395,20 @@ void GUIFormSpecMenu::drawMenu()
video::IVideoDriver* driver = Environment->getVideoDriver();
v2u32 screenSize = driver->getScreenSize();
core::rect<s32> allbg(0, 0, screenSize.X , screenSize.Y);
if (m_bgfullscreen)
core::rect<s32> allbg(0, 0, screenSize.X, screenSize.Y);
if (m_bgfullscreen) {
v3f formspec_bgcolor = g_settings->getV3F("formspec_fullscreen_bg_color");
m_bgcolor = video::SColor(
(u8) clamp_u8(g_settings->getS32("formspec_fullscreen_bg_opacity")),
clamp_u8(myround(formspec_bgcolor.X)),
clamp_u8(myround(formspec_bgcolor.Y)),
clamp_u8(myround(formspec_bgcolor.Z))
);
driver->draw2DRectangle(m_bgcolor, allbg, &allbg);
else
} else {
driver->draw2DRectangle(m_bgcolor, AbsoluteRect, &AbsoluteClippingRect);
}
m_tooltip_element->setVisible(false);