X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fcommon%2Frender-algorithms.cpp;h=664eb6bdec61d12a842f68c449cd4a35367470ff;hp=94658ea62dbac83e081d60df45646f36a6142625;hb=511ae6e260dfc6b58898069f9495bdf9f51f8bb9;hpb=1c89ce2bcf0f628f3e6ecb230cad7adfe9267759 diff --git a/dali/internal/render/common/render-algorithms.cpp b/dali/internal/render/common/render-algorithms.cpp index 94658ea..664eb6b 100644 --- a/dali/internal/render/common/render-algorithms.cpp +++ b/dali/internal/render/common/render-algorithms.cpp @@ -244,9 +244,9 @@ inline void RenderAlgorithms::SetupScissorClipping( const RenderItem& item, Cont // So we know if we are at depth 4 and the stackDepth is 5, that we have gone up. // If the depth is the same then we are effectively part of a different sub-tree from the parent, we must also remove the current clip. // Note: Stack depth must always be at least 1, as we will have the layer or stage size as the root value. - if( ( childStackDepth > 0u ) && ( scissorDepth <= childStackDepth ) ) + if( ( childStackDepth > 0u ) && ( scissorDepth < childStackDepth ) ) { - while( scissorDepth <= childStackDepth ) // Pop until sibling + while( scissorDepth < childStackDepth ) { mScissorStack.pop_back(); --childStackDepth; @@ -255,7 +255,7 @@ 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 + if( clippingNode && childStackDepth > 0u && childStackDepth == scissorDepth ) // case of sibling clip area { mScissorStack.pop_back(); --childStackDepth;