X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fradio-button-impl.cpp;h=d1ccebd87f79b6fb7ef2ccf193c0067157b28a6b;hp=2bcb9014bf350695c01179beee11178452a68e50;hb=6b7d48695715c6f2292338fccbeeb02873d1f89d;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index 2bcb901..d1ccebd 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -20,12 +20,17 @@
 #include "radio-button-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/text-actor.h>
 #include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/scripting/scripting.h>
+#include <dali/public-api/images/resource-image.h>
 
-using namespace Dali;
-using namespace Dali::Toolkit::Internal;
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+namespace Internal
+{
 
 namespace
 {
@@ -59,188 +64,194 @@ Dali::Toolkit::RadioButton RadioButton::New()
 }
 
 RadioButton::RadioButton()
-  : mSelected(false)
 {
-  mUnselectedImage = Dali::Image::New( UNSELECTED_BUTTON_IMAGE_DIR );
-  mSelectedImage = Dali::Image::New( SELECTED_BUTTON_IMAGE_DIR );
-
-  mRadioIcon = Dali::ImageActor::New( mUnselectedImage );
+  SetTogglableButton(true);
 }
 
 RadioButton::~RadioButton()
 {
 }
 
-void RadioButton::SetLabel(const std::string& label)
+void RadioButton::SetButtonImage( Actor image )
 {
-  TextActor textActor = TextActor::DownCast( mLabel );
-  if( textActor )
-  {
-    textActor.SetText( label );
-  }
-  else
-  {
-    Toolkit::TextView newTextView = Toolkit::TextView::New( label );
-    SetLabel( newTextView );
-  }
-
-  RelayoutRequest();
-}
+  Actor& buttonImage = GetButtonImage();
 
-void RadioButton::SetLabel(Actor label)
-{
-  if( mLabel != label )
+  if( !IsSelected() )
   {
-    if( mLabel )
+    if( buttonImage && buttonImage.GetParent() )
     {
-      mRadioIcon.Remove( mLabel );
+      buttonImage.GetParent().Remove( buttonImage );
+      buttonImage.Reset();
     }
 
+    Self().Add( image );
+
+    Actor& label = GetLabel();
+
     if( label )
     {
-      label.SetParentOrigin( ParentOrigin::CENTER_RIGHT );
-      label.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
-      label.MoveBy( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-      mRadioIcon.Add( label );
+      buttonImage.Remove( label );
+      image.Add( label );
     }
+  }
 
-    mLabel = label;
+  buttonImage = image;
 
-    RelayoutRequest();
-  }
+  buttonImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  buttonImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
 }
 
-Actor RadioButton::GetLabel() const
+void RadioButton::SetSelectedImage( Actor image )
 {
-  return mLabel;
-}
+  Actor& selectedImage = GetSelectedImage();
 
-void RadioButton::SetSelected(bool selected)
-{
-  if( mSelected != selected )
+  if( IsSelected() )
   {
-    if( selected )
+    if( selectedImage && selectedImage.GetParent() )
     {
-      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));
+      selectedImage.GetParent().Remove( selectedImage );
+      selectedImage.Reset();
+    }
 
-          if( rbChild )
-          {
-            rbChild.SetSelected(false);
-          }
-        }
-      }
+    Self().Add( image );
 
-      mSelected = true;
-      mRadioIcon.SetImage(mSelectedImage);
-    }
-    else
+    Actor& label = GetLabel();
+
+    if( label )
     {
-      mSelected = false;
-      mRadioIcon.SetImage(mUnselectedImage);
+      selectedImage.Remove( label );
+      image.Add( label );
     }
-
-    // Raise state changed signal
-    Toolkit::RadioButton handle( GetOwner() );
-    mStateChangedSignal.Emit( handle, mSelected );
-
-    RelayoutRequest();
   }
-}
 
-bool RadioButton::IsSelected()const
-{
-  return mSelected;
-}
+  selectedImage = image;
 
-void RadioButton::ToggleState()
-{
-  SetSelected(!mSelected);
+  selectedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  selectedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
 }
 
-void RadioButton::OnRelayout( const Vector2& /*size*/, ActorSizeContainer& container )
+void RadioButton::OnButtonInitialize()
 {
-  Vector3 newSize( mRadioIcon.GetNaturalSize() );
-
-  if( mLabel )
-  {
-    // 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( mLabel.GetNaturalSize() );
-    Control::Relayout( mLabel, Vector2( actorNaturalSize.width, actorNaturalSize.height ), container );
-
-    Vector3 actorSize( mLabel.GetSize() );
-    newSize.width += actorSize.width;
-    newSize.height = std::max( newSize.height, actorSize.height );
-  }
+  Image buttonImage = Dali::ResourceImage::New( UNSELECTED_BUTTON_IMAGE_DIR );
+  Image selectedImage = Dali::ResourceImage::New( SELECTED_BUTTON_IMAGE_DIR );
 
-  Self().SetSize( newSize );
-}
-
-void RadioButton::OnInitialize()
-{
-  mRadioIcon.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
-  mRadioIcon.SetParentOrigin( ParentOrigin::CENTER_LEFT );
-  Self().Add( mRadioIcon );
+  SetButtonImage( ImageActor::New( buttonImage ) );
+  SetSelectedImage( ImageActor::New( selectedImage ) );
 
   RelayoutRequest();
 }
 
 void RadioButton::OnButtonUp()
 {
-  // Don't allow selection on an already selected radio button
-  if( !mSelected )
+  if( ButtonDown == GetState() )
   {
-    ToggleState();
+    // Don't allow selection on an already selected radio button
+    if( !IsSelected() )
+    {
+      SetSelected(!IsSelected());
+    }
   }
 }
 
-void RadioButton::SetProperty(BaseObject* object, Property::Index propertyIndex, const Property::Value& value)
+void RadioButton::OnLabelSet()
 {
-  Toolkit::RadioButton radioButton = Toolkit::RadioButton::DownCast( Dali::BaseHandle( object ) );
+  Actor& label = GetLabel();
 
-  if( radioButton )
+  if( label )
   {
-    RadioButton& radioButtonImpl( GetImplementation( radioButton ) );
+    label.SetParentOrigin( ParentOrigin::CENTER_RIGHT );
+    label.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
+    label.TranslateBy( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
 
-    if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
+    if( IsSelected() )
     {
-      radioButtonImpl.SetSelected( value.Get< bool >( ) );
+      GetSelectedImage().Add( label );
     }
-    else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
+    else
     {
-      radioButtonImpl.SetLabel( Scripting::NewActor( value.Get< Property::Map >( ) ) );
+      GetButtonImage().Add( label );
     }
   }
 }
 
-Property::Value RadioButton::GetProperty(BaseObject* object, Property::Index propertyIndex)
+void RadioButton::OnSelected( bool selected )
 {
-  Property::Value value;
-
-  Toolkit::RadioButton radioButton = Toolkit::RadioButton::DownCast( Dali::BaseHandle(object) );
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& label = GetLabel();
 
-  if( radioButton )
+  if( selected )
   {
-    RadioButton& radioButtonImpl( GetImplementation( radioButton ) );
+    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);
+        }
+      }
+    }
 
-    if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
+    buttonImage.GetParent().Remove( buttonImage );
+    Self().Add( selectedImage );
+
+    if( label )
     {
-      value = radioButtonImpl.mSelected;
+      label.GetParent().Remove( label );
+      selectedImage.Add( label );
     }
-    else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
+  }
+  else
+  {
+    selectedImage.GetParent().Remove( selectedImage );
+    Self().Add( buttonImage );
+
+    if( label )
     {
-      Property::Map map;
-      Scripting::CreatePropertyMap( radioButtonImpl.mLabel, map );
-      value = map;
+      label.GetParent().Remove( label );
+      buttonImage.Add( label );
     }
   }
+}
 
-  return value;
+void RadioButton::OnRelayout( const Vector2& /*size*/, ActorSizeContainer& container )
+{
+  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 );
 }
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali