SVACE error in size negotiation mapper

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / layouting / size-negotiation-mapper.cpp

diff --git a/dali-toolkit/internal/layouting/size-negotiation-mapper.cpp b/dali-toolkit/internal/layouting/size-negotiation-mapper.cpp
index a0f052a..2a1c7a3 100644 (file)
--- a/dali-toolkit/internal/layouting/size-negotiation-mapper.cpp
+++ b/dali-toolkit/internal/layouting/size-negotiation-mapper.cpp
@@ -150,17 +150,13 @@ void SizeNegotiationMapper::SetLayoutParametersUsingResizePolicy( Toolkit::Contr
   // matchedLayoutParamHeight should not be used.
   if( matchFound )
   {
-    if( dimension == Dimension::WIDTH )
+    if( dimension & Dimension::WIDTH )
     {
       SetWidthLayoutParams( control, matchedLayoutParamWidth );
     }
-    else if( dimension == Dimension::HEIGHT )
-    {
-      SetHeightLayoutParams( control, matchedLayoutParamHeight );
-    }
-    else if( Dimension::ALL_DIMENSIONS )
+
+    if( dimension & Dimension::HEIGHT )
     {
-      SetWidthLayoutParams( control, matchedLayoutParamWidth );
       SetHeightLayoutParams( control, matchedLayoutParamHeight );
     }
   }