From 1b3e4e173624bb2523d4386aeef6987709d9b022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Tue, 29 Aug 2017 19:25:16 +0200 Subject: 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 --- src/guiFormSpecMenu.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/guiFormSpecMenu.h') diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 02f367fbf..c86d596b7 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -66,7 +66,7 @@ class IFormSource { public: virtual ~IFormSource() = default; - virtual std::string getForm() = 0; + virtual const std::string &getForm() const = 0; // Fill in variables in field text virtual std::string resolveText(const std::string &str) { return str; } }; @@ -419,6 +419,7 @@ protected: bool m_bgfullscreen; bool m_slotborder; video::SColor m_bgcolor; + video::SColor m_fullscreen_bgcolor; video::SColor m_slotbg_n; video::SColor m_slotbg_h; video::SColor m_slotbordercolor; @@ -554,7 +555,10 @@ public: m_formspec = FORMSPEC_VERSION_STRING + formspec; } - std::string getForm() { return m_formspec; } + const std::string &getForm() const + { + return m_formspec; + } std::string m_formspec; }; -- cgit v1.2.3