summaryrefslogtreecommitdiff
path: root/src/guiFormSpecMenu.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-08-29 19:25:16 +0200
committerGitHub <noreply@github.com>2017-08-29 19:25:16 +0200
commit1b3e4e173624bb2523d4386aeef6987709d9b022 (patch)
tree5524dc581ac1ccc313a73d4626cea2efe5550507 /src/guiFormSpecMenu.cpp
parent72c09f524b1616dd75bb6e35008196b5ca6351a2 (diff)
downloadminetest-1b3e4e173624bb2523d4386aeef6987709d9b022.tar.gz
minetest-1b3e4e173624bb2523d4386aeef6987709d9b022.tar.bz2
minetest-1b3e4e173624bb2523d4386aeef6987709d9b022.zip
Formspec: Add options to set background color and opacity (fullscreen mode + default mode) (#5493)
* Formspec: Add options to set background color and opacity (fullscreen mode) * Enhance previous comment: Set formspec background when regenerate UI. * This permit to do the calcul only at regen and override it with bgcolor tag * Add a setting for default background color into formspec, separated from fullscreen * Add a little performance gain on formspecs using a const ref instead of copying formspec string
Diffstat (limited to 'src/guiFormSpecMenu.cpp')
-rw-r--r--src/guiFormSpecMenu.cpp54
1 files changed, 40 insertions, 14 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 5ae652601..7b7bd7c29 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -79,6 +79,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(JoystickController *joystick,
gui::IGUIElement *parent, s32 id, IMenuManager *menumgr,
Client *client, ISimpleTextureSource *tsrc, IFormSource *fsrc, TextDest *tdst,
@@ -1567,17 +1572,19 @@ void GUIFormSpecMenu::parseBackgroundColor(parserData* data, const std::string &
std::vector<std::string> parts = split(element,';');
if (((parts.size() == 1) || (parts.size() == 2)) ||
- ((parts.size() > 2) && (m_formspec_version > FORMSPEC_API_VERSION)))
- {
- parseColorString(parts[0],m_bgcolor,false);
+ ((parts.size() > 2) && (m_formspec_version > FORMSPEC_API_VERSION))) {
+ parseColorString(parts[0], m_bgcolor, false);
if (parts.size() == 2) {
std::string fullscreen = parts[1];
m_bgfullscreen = is_yes(fullscreen);
}
+
return;
}
- errorstream<< "Invalid bgcolor element(" << parts.size() << "): '" << element << "'" << std::endl;
+
+ errorstream << "Invalid bgcolor element(" << parts.size() << "): '" << element << "'"
+ << std::endl;
}
void GUIFormSpecMenu::parseListColors(parserData* data, const std::string &element)
@@ -1908,9 +1915,8 @@ void GUIFormSpecMenu::parseElement(parserData* data, const std::string &element)
}
// Ignore others
- infostream
- << "Unknown DrawSpec: type="<<type<<", data=\""<<description<<"\""
- <<std::endl;
+ infostream << "Unknown DrawSpec: type=" << type << ", data=\"" << description << "\""
+ << std::endl;
}
void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
@@ -1978,10 +1984,29 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
m_static_texts.clear();
m_dropdowns.clear();
- // Set default values (fits old formspec values)
- m_bgcolor = video::SColor(140,0,0,0);
m_bgfullscreen = false;
+ {
+ 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");
+ m_fullscreen_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))
+ );
+ }
+
+
m_slotbg_n = video::SColor(255,128,128,128);
m_slotbg_h = video::SColor(255,192,192,192);
@@ -2401,9 +2426,9 @@ void GUIFormSpecMenu::drawSelectedItem()
void GUIFormSpecMenu::drawMenu()
{
- if(m_form_src){
- std::string newform = m_form_src->getForm();
- if(newform != m_formspec_string){
+ if (m_form_src) {
+ const std::string &newform = m_form_src->getForm();
+ if (newform != m_formspec_string) {
m_formspec_string = newform;
regenerateGui(m_screensize_old);
}
@@ -2419,9 +2444,10 @@ void GUIFormSpecMenu::drawMenu()
video::IVideoDriver* driver = Environment->getVideoDriver();
v2u32 screenSize = driver->getScreenSize();
- core::rect<s32> allbg(0, 0, screenSize.X , screenSize.Y);
+ core::rect<s32> allbg(0, 0, screenSize.X, screenSize.Y);
+
if (m_bgfullscreen)
- driver->draw2DRectangle(m_bgcolor, allbg, &allbg);
+ driver->draw2DRectangle(m_fullscreen_bgcolor, allbg, &allbg);
else
driver->draw2DRectangle(m_bgcolor, AbsoluteRect, &AbsoluteClippingRect);