diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/gui/guiBackgroundImage.cpp | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/gui/guiBackgroundImage.cpp')
| -rw-r--r-- | src/gui/guiBackgroundImage.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/guiBackgroundImage.cpp b/src/gui/guiBackgroundImage.cpp index 21c1e88cf..6b9559087 100644 --- a/src/gui/guiBackgroundImage.cpp +++ b/src/gui/guiBackgroundImage.cpp @@ -20,11 +20,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "log.h" GUIBackgroundImage::GUIBackgroundImage(gui::IGUIEnvironment *env, - gui::IGUIElement *parent, s32 id, const core::rect<s32> &rectangle, - const std::string &name, const core::rect<s32> &middle, - ISimpleTextureSource *tsrc, bool autoclip) : - gui::IGUIElement(gui::EGUIET_ELEMENT, env, parent, id, rectangle), - m_name(name), m_middle(middle), m_tsrc(tsrc), m_autoclip(autoclip) + gui::IGUIElement *parent, s32 id, const core::rect<s32> &rectangle, + const std::string &name, const core::rect<s32> &middle, + ISimpleTextureSource *tsrc, bool autoclip) : + gui::IGUIElement(gui::EGUIET_ELEMENT, env, parent, id, rectangle), + m_name(name), m_middle(middle), m_tsrc(tsrc), m_autoclip(autoclip) { } @@ -37,7 +37,7 @@ void GUIBackgroundImage::draw() if (!texture) { errorstream << "GUIBackgroundImage::draw() Unable to load texture:" - << std::endl; + << std::endl; errorstream << "\t" << m_name << std::endl; return; } @@ -53,7 +53,8 @@ void GUIBackgroundImage::draw() const video::SColor colors[] = {color, color, color, color}; draw2DImageFilterScaled(driver, texture, rect, core::rect<s32>(core::position2d<s32>(0, 0), - core::dimension2di(texture->getOriginalSize())), + core::dimension2di( + texture->getOriginalSize())), nullptr, colors, true); } else { core::rect<s32> middle = m_middle; |