From: adam.b <adam.b@samsung.com>
Date: Fri, 20 Oct 2017 16:58:31 +0000 (+0100)
Subject: Bounding box clipping fix
X-Git-Tag: accepted/tizen/4.0/unified/20171103.162647~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=84baa4efc405ccacaf9eed2b701363e6ed7fec69

Bounding box clipping fix

Fixes issue occurring when two or more clipping areas are direct siblings and previous sibling becomes automatically a parent.

Change-Id: I66e6e6686e5b22597317bc0d583f33f962405097
---

diff --git a/dali/internal/render/common/render-algorithms.cpp b/dali/internal/render/common/render-algorithms.cpp
index 9a28418..d596568 100644
--- a/dali/internal/render/common/render-algorithms.cpp
+++ b/dali/internal/render/common/render-algorithms.cpp
@@ -255,6 +255,10 @@ inline void RenderAlgorithms::SetupScissorClipping( const RenderItem& item, Cont
     // We traversed up the tree, we need to apply a new scissor rectangle (unless we are at the root).
     traversedUpTree = true;
   }
+  else if( clippingNode && childStackDepth > 0u && childStackDepth == scissorDepth ) // case of sibling clip area
+  {
+    mScissorStack.pop_back();
+  }
 
   // If we are on a clipping node, or we have traveled up the tree and gone back past a clipping node, may need to apply a new scissor clip.
   if( clippingNode || traversedUpTree )