Changed Control::SetLayout to handle empty layouts

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / button-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 7f91013..84dd7a1 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -689,50 +689,53 @@ bool Button::OnAccessibilityActivated()
 bool Button::OnTouch( Actor actor, const TouchData& touch )
 {
 
-  // Only events are processed when the button is not disabled and the touch event has only
-  // one touch point.
+  // Only events are processed when the button is not disabled
+  auto result( false );
 
-  if( !IsDisabled() && ( 1 == touch.GetPointCount() ) )
+  if( !IsDisabled() )
   {
-    switch( touch.GetState( 0 ) )
+    if ( 1 == touch.GetPointCount() )
     {
-      case PointState::DOWN:
-      {
-        ButtonDown();
-        break;
-      }
-      case PointState::UP:
-      {
-        ButtonUp();
-        break;
-      }
-      case PointState::INTERRUPTED:
-      {
-        OnTouchPointInterrupted();
-        break;
-      }
-      case PointState::LEAVE:
-      {
-        OnTouchPointLeave();
-        break;
-      }
-      case PointState::MOTION:
-      case PointState::STATIONARY: // FALLTHROUGH
+      switch( touch.GetState( 0 ) )
       {
-        // Nothing to do
-        break;
+        case PointState::DOWN:
+        {
+          ButtonDown();
+          break;
+        }
+        case PointState::UP:
+        {
+          ButtonUp();
+          break;
+        }
+        case PointState::INTERRUPTED:
+        {
+          OnTouchPointInterrupted();
+          break;
+        }
+        case PointState::LEAVE:
+        {
+          OnTouchPointLeave();
+          break;
+        }
+        case PointState::MOTION:
+        case PointState::STATIONARY: // FALLTHROUGH
+        {
+          // Nothing to do
+          break;
+        }
       }
     }
-  }
-  else if( 1 < touch.GetPointCount() )
-  {
-    OnTouchPointLeave(); // Notification for derived classes.
+    else if( 1 < touch.GetPointCount() )
+    {
+      OnTouchPointLeave(); // Notification for derived classes.
 
-    // Sets the button state to the default
-    mButtonPressedState = UNPRESSED;
+      // Sets the button state to the default
+      mButtonPressedState = UNPRESSED;
+    }
+    result = true;
   }
-
-  return false;
+  return result;
 }
 
 bool Button::OnKeyboardEnter()