Fix svace issues in LinearLayout.

Change-Id: If82808ed8390cc5ae9305f495ca4647cca1a8a7a

diff --git a/dali-toolkit/devel-api/layouting/layout-size.h b/dali-toolkit/devel-api/layouting/layout-size.h
index c5ab2dd..b7ec71e 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-size.h
+++ b/dali-toolkit/devel-api/layouting/layout-size.h
@@ -87,6 +87,11 @@ public:
     return x==rhs.x && y==rhs.y;
   }
 
+  bool operator!=( const LayoutSize& rhs )
+  {
+    return !( *this==rhs );
+  }
+
   union
   {
     LayoutLength::IntType x;

diff --git a/dali-toolkit/devel-api/layouting/linear-layout.cpp b/dali-toolkit/devel-api/layouting/linear-layout.cpp
index e9e7e5b..4a63036 100644 (file)
--- a/dali-toolkit/devel-api/layouting/linear-layout.cpp
+++ b/dali-toolkit/devel-api/layouting/linear-layout.cpp
@@ -57,25 +57,21 @@ LinearLayout& LinearLayout::operator=( const LinearLayout& other )
 void LinearLayout::SetCellPadding( LayoutSize size )
 {
   GetImplementation(*this).SetCellPadding( size );
-  GetImplementation(*this).RequestLayout();
 }
 
 LayoutSize LinearLayout::GetCellPadding()
 {
   return GetImplementation(*this).GetCellPadding();
-  GetImplementation(*this).RequestLayout();
 }
 
 void LinearLayout::SetOrientation( LinearLayout::Orientation orientation )
 {
   GetImplementation(*this).SetOrientation( orientation );
-  GetImplementation(*this).RequestLayout();
 }
 
 LinearLayout::Orientation LinearLayout::GetOrientation()
 {
   return GetImplementation(*this).GetOrientation();
-  GetImplementation(*this).RequestLayout();
 }
 
 LinearLayout::LinearLayout( Dali::Toolkit::Internal::LinearLayout* object )

diff --git a/dali-toolkit/internal/layouting/linear-layout-impl.cpp b/dali-toolkit/internal/layouting/linear-layout-impl.cpp
index 6b91bc0..7b3720c 100644 (file)
--- a/dali-toolkit/internal/layouting/linear-layout-impl.cpp
+++ b/dali-toolkit/internal/layouting/linear-layout-impl.cpp
@@ -61,7 +61,11 @@ LinearLayout::~LinearLayout()
 
 void LinearLayout::SetCellPadding( LayoutSize size )
 {
-  mCellPadding = size;
+  if ( mCellPadding != size )
+  {
+    mCellPadding = size;
+    RequestLayout();
+  }
 }
 
 LayoutSize LinearLayout::GetCellPadding()
@@ -71,7 +75,11 @@ LayoutSize LinearLayout::GetCellPadding()
 
 void LinearLayout::SetOrientation( Dali::Toolkit::LinearLayout::Orientation orientation )
 {
-  mOrientation = orientation;
+  if ( mOrientation != orientation )
+  {
+    mOrientation = orientation;
+    RequestLayout();
+  }
 }
 
 Dali::Toolkit::LinearLayout::Orientation LinearLayout::GetOrientation()