From 5506e97ed897dde2d4820fe1b021a4622bae03b3 Mon Sep 17 00:00:00 2001 From: DS Date: Thu, 7 Nov 2019 20:11:01 +0100 Subject: Formspec: draw order and clipping for all elements (#8740) --- src/client/guiscalingfilter.cpp | 7 +++---- src/client/guiscalingfilter.h | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/client') 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 &rect, const core::rect &middle) + const core::rect &rect, const core::rect &middle, + const core::rect *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 &rect, const core::rect &middle); + const core::rect &rect, const core::rect &middle, + const core::rect *cliprect = nullptr); -- cgit v1.2.3