diff options
author | Alexander Tkachev | 2016-06-21 16:45:07 +0600 |
---|---|---|
committer | Eugene Sandulenko | 2016-07-03 12:15:51 +0200 |
commit | 3d2730a0ddd1e1e33e6639775727beb954d7bfc0 (patch) | |
tree | 95fad7b305302339edad4f73fa7c0bbb0075a24c /graphics/VectorRendererSpec.cpp | |
parent | d7278cc48b7fd9c1848da6402316663af2d0c7bd (diff) | |
download | scummvm-rg350-3d2730a0ddd1e1e33e6639775727beb954d7bfc0.tar.gz scummvm-rg350-3d2730a0ddd1e1e33e6639775727beb954d7bfc0.tar.bz2 scummvm-rg350-3d2730a0ddd1e1e33e6639775727beb954d7bfc0.zip |
GUI: clippingRect propagated deeper
Diffstat (limited to 'graphics/VectorRendererSpec.cpp')
-rw-r--r-- | graphics/VectorRendererSpec.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp index 258d935440..6c559e0f70 100644 --- a/graphics/VectorRendererSpec.cpp +++ b/graphics/VectorRendererSpec.cpp @@ -920,6 +920,29 @@ drawRoundedSquare(int x, int y, int r, int w, int h) { template<typename PixelType> void VectorRendererSpec<PixelType>:: +drawRoundedSquareClip(int x, int y, int r, int w, int h, int cx, int cy, int cw, int ch) { + if (x + w > Base::_activeSurface->w || y + h > Base::_activeSurface->h || + w <= 0 || h <= 0 || x < 0 || y < 0 || r <= 0) + return; + + if ((r * 2) > w || (r * 2) > h) + r = MIN(w / 2, h / 2); + + if (r <= 0) + return; + + if (Base::_fillMode != kFillDisabled && Base::_shadowOffset + && x + w + Base::_shadowOffset + 1 < Base::_activeSurface->w + && y + h + Base::_shadowOffset + 1 < Base::_activeSurface->h + && h > (Base::_shadowOffset + 1) * 2) { + drawRoundedSquareShadow(x, y, r, w, h, Base::_shadowOffset); + } + + drawRoundedSquareAlg(x, y, r, w, h, _fgColor, Base::_fillMode); +} + +template<typename PixelType> +void VectorRendererSpec<PixelType>:: drawTab(int x, int y, int r, int w, int h) { if (x + w > Base::_activeSurface->w || y + h > Base::_activeSurface->h || w <= 0 || h <= 0 || x < 0 || y < 0 || r > w || r > h) |