summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorDS <vorunbekannt75@web.de>2019-11-07 20:11:01 +0100
committerSmallJoker <SmallJoker@users.noreply.github.com>2019-11-07 20:11:01 +0100
commit5506e97ed897dde2d4820fe1b021a4622bae03b3 (patch)
tree85a029b7f9bb046bcf338abad3ea1e50362d6164 /src/client
parent15a030ec9f5d9016c287cf3964894683121e59fd (diff)
downloadminetest-5506e97ed897dde2d4820fe1b021a4622bae03b3.tar.gz
minetest-5506e97ed897dde2d4820fe1b021a4622bae03b3.tar.bz2
minetest-5506e97ed897dde2d4820fe1b021a4622bae03b3.zip
Formspec: draw order and clipping for all elements (#8740)
Diffstat (limited to 'src/client')
-rw-r--r--src/client/guiscalingfilter.cpp7
-rw-r--r--src/client/guiscalingfilter.h3
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/guiscalingfilter.cpp b/src/client/guiscalingfilter.cpp
index 2ff57ab74..4262331bd 100644
--- a/src/client/guiscalingfilter.cpp
+++ b/src/client/guiscalingfilter.cpp
@@ -171,7 +171,8 @@ void draw2DImageFilterScaled(video::IVideoDriver *driver, video::ITexture *txr,
}
void draw2DImage9Slice(video::IVideoDriver *driver, video::ITexture *texture,
- const core::rect<s32> &rect, const core::rect<s32> &middle)
+ const core::rect<s32> &rect, const core::rect<s32> &middle,
+ const core::rect<s32> *cliprect)
{
const video::SColor color(255,255,255,255);
const video::SColor colors[] = {color,color,color,color};
@@ -222,9 +223,7 @@ void draw2DImage9Slice(video::IVideoDriver *driver, video::ITexture *texture,
break;
}
- draw2DImageFilterScaled(driver, texture, dest,
- src,
- NULL/*&AbsoluteClippingRect*/, colors, true);
+ draw2DImageFilterScaled(driver, texture, dest, src, cliprect, colors, true);
}
}
}
diff --git a/src/client/guiscalingfilter.h b/src/client/guiscalingfilter.h
index 181009551..b703d91f0 100644
--- a/src/client/guiscalingfilter.h
+++ b/src/client/guiscalingfilter.h
@@ -53,4 +53,5 @@ void draw2DImageFilterScaled(video::IVideoDriver *driver, video::ITexture *txr,
* 9-slice / segment drawing
*/
void draw2DImage9Slice(video::IVideoDriver *driver, video::ITexture *texture,
- const core::rect<s32> &rect, const core::rect<s32> &middle);
+ const core::rect<s32> &rect, const core::rect<s32> &middle,
+ const core::rect<s32> *cliprect = nullptr);