X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Flayouting%2Fsize-negotiation-mapper.cpp;h=2a1c7a3c25e3e58f43b2d27af883fa078c1135e0;hb=c440dd0d4d403b2b31a426a472810e2f94c80f25;hp=a0f052a790d0a8989be77d955428974e9e3aab43;hpb=66581ed768a430adc3e6a630948c28bfe6c32aa4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/layouting/size-negotiation-mapper.cpp b/dali-toolkit/internal/layouting/size-negotiation-mapper.cpp
index a0f052a..2a1c7a3 100644
--- 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 );
     }
   }