Removed OnButton virtual functions and simplified RadioButton logic

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

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index d279697..9dd7570 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -20,9 +20,14 @@
 #include "radio-button-impl.h"
 
 // EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/images/resource-image.h>
 
+#if defined(DEBUG_ENABLED)
+  extern Debug::Filter* gLogButtonFilter;
+#endif
+
 namespace Dali
 {
 
@@ -42,10 +47,6 @@ BaseHandle Create()
 
 TypeRegistration typeRegistration( typeid( Toolkit::RadioButton ), typeid( Toolkit::Button ), Create);
 
-const char* const UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-unselected.png";
-const char* const SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-selected.png";
-
-const Vector3 DISTANCE_BETWEEN_IMAGE_AND_LABEL(5.0f, 0.0f, 0.0f);
 }
 
 Dali::Toolkit::RadioButton RadioButton::New()
@@ -72,182 +73,51 @@ RadioButton::~RadioButton()
 {
 }
 
-void RadioButton::SetButtonImage( Actor image )
-{
-  Actor& buttonImage = GetButtonImage();
-
-  if( !IsSelected() )
-  {
-    if( buttonImage && buttonImage.GetParent() )
-    {
-      buttonImage.GetParent().Remove( buttonImage );
-      buttonImage.Reset();
-    }
-
-    Self().Add( image );
-
-    Actor& label = GetLabel();
-
-    if( label )
-    {
-      buttonImage.Remove( label );
-      image.Add( label );
-    }
-  }
-
-  buttonImage = image;
-
-  buttonImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  buttonImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
-}
-
-void RadioButton::SetSelectedImage( Actor image )
-{
-  Actor& selectedImage = GetSelectedImage();
-
-  if( IsSelected() )
-  {
-    if( selectedImage && selectedImage.GetParent() )
-    {
-      selectedImage.GetParent().Remove( selectedImage );
-      selectedImage.Reset();
-    }
-
-    Self().Add( image );
-
-    Actor& label = GetLabel();
-
-    if( label )
-    {
-      selectedImage.Remove( label );
-      image.Add( label );
-    }
-  }
-
-  selectedImage = image;
-
-  selectedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  selectedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
-}
-
-void RadioButton::OnButtonInitialize()
+void RadioButton::OnInitialize()
 {
-  Image buttonImage = Dali::ResourceImage::New( UNSELECTED_BUTTON_IMAGE_DIR );
-  Image selectedImage = Dali::ResourceImage::New( SELECTED_BUTTON_IMAGE_DIR );
-
-  SetButtonImage( ImageActor::New( buttonImage ) );
-  SetSelectedImage( ImageActor::New( selectedImage ) );
-
-  RelayoutRequest();
+  Button::OnInitialize();
 }
 
-void RadioButton::OnButtonUp()
+bool RadioButton::OnToggleReleased()
 {
-  if( ButtonDown == GetState() )
-  {
-    // Don't allow selection on an already selected radio button
-    if( !IsSelected() )
-    {
-      SetSelected(!IsSelected());
-    }
-  }
-}
-
-void RadioButton::OnLabelSet()
-{
-  Actor& label = GetLabel();
-
-  if( label )
-  {
-    label.SetParentOrigin( ParentOrigin::CENTER_RIGHT );
-    label.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
-    label.MoveBy( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-
-    if( IsSelected() )
-    {
-      GetSelectedImage().Add( label );
-    }
-    else
-    {
-      GetButtonImage().Add( label );
-    }
-  }
-}
-
-void RadioButton::OnSelected( bool selected )
-{
-  Actor& buttonImage = GetButtonImage();
-  Actor& selectedImage = GetSelectedImage();
-  Actor& label = GetLabel();
-
-  if( selected )
-  {
-    Actor parent = Self().GetParent();
-    if( parent )
-    {
-      for( unsigned int i = 0; i < parent.GetChildCount(); ++i )
-      {
-        Dali::Toolkit::RadioButton rbChild = Dali::Toolkit::RadioButton::DownCast(parent.GetChildAt(i));
-
-        if( rbChild )
-        {
-          rbChild.SetSelected(false);
-        }
-      }
-    }
-
-    buttonImage.GetParent().Remove( buttonImage );
-    Self().Add( selectedImage );
-
-    if( label )
-    {
-      label.GetParent().Remove( label );
-      selectedImage.Add( label );
-    }
-  }
-  else
+  // Radio button overrides toggle release (button up) as doesn't allow un-selection to be performed on it directly.
+  bool stateChanged = false;
+  if( !IsSelected() )
   {
-    selectedImage.GetParent().Remove( selectedImage );
-    Self().Add( buttonImage );
-
-    if( label )
-    {
-      label.GetParent().Remove( label );
-      buttonImage.Add( label );
-    }
+    Button::SetSelected( true ); // Set button to selected as previously unselected
+    stateChanged = true;
   }
+  return stateChanged;
 }
 
-void RadioButton::OnRelayout( const Vector2& /*size*/, ActorSizeContainer& container )
+void RadioButton::OnStateChange( State newState )
 {
-  Vector3 newSize;
-
-  if( IsSelected() )
-  {
-    newSize = GetSelectedImage().GetNaturalSize();
-  }
-  else
-  {
-    newSize = GetButtonImage().GetNaturalSize();
-  }
-
-  Actor& label = GetLabel();
-
-  if( label )
-  {
-    // Offset the label from the radio button image
-    newSize.width += DISTANCE_BETWEEN_IMAGE_AND_LABEL.width;
-
-    // Find the size of the control using size negotiation
-    Vector3 actorNaturalSize( label.GetNaturalSize() );
-    Control::Relayout( label, Vector2( actorNaturalSize.width, actorNaturalSize.height ), container );
-
-    Vector3 actorSize( label.GetSize() );
-    newSize.width += actorSize.width;
-    newSize.height = std::max( newSize.height, actorSize.height );
-  }
-
-  Self().SetSize( newSize );
+  // Radio button can be part of a group, if a button in the group is selected then all others should be unselected
+  DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "RadioButton::OnStateChange state(%d)\n", newState );
+
+   switch( newState )
+   {
+     case SELECTED_STATE:
+     {
+       Actor parent = Self().GetParent();
+       if( parent )
+       {
+         for( unsigned int i = 0; i < parent.GetChildCount(); ++i )
+         {
+           Dali::Toolkit::RadioButton radioButtonChild = Dali::Toolkit::RadioButton::DownCast( parent.GetChildAt( i ) );
+           if( radioButtonChild && radioButtonChild != Self() )
+           {
+             radioButtonChild.SetSelected( false );
+           }
+         }
+       }
+     }
+
+     default:
+     {
+       break;
+     }
+   }
 }
 
 } // namespace Internal