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=1e51ce3259ee49859a597a320f7f2ab57c0ba375;hp=05dba27eb4205a6f76077e1d6b45187c1db2ea1c;hb=efc136204e9a4460a7a2421e673c873e23974a80;hpb=826a077bb3183b5d317bfb22e14ab4e217d26f40

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index 05dba27..1e51ce3 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -44,8 +44,10 @@ TypeRegistration typeRegistration( typeid( Toolkit::RadioButton ), typeid( Toolk
 
 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 char* const DISABLED_UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-unselected-disabled.png";
+const char* const DISABLED_SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-selected-disabled.png";
 
-const float DISTANCE_BETWEEN_IMAGE_AND_LABEL = 5.0f;
+const float DISTANCE_BETWEEN_IMAGE_AND_LABEL( 5.0f );
 }
 
 Dali::Toolkit::RadioButton RadioButton::New()
@@ -72,47 +74,22 @@ RadioButton::~RadioButton()
 {
 }
 
-void RadioButton::SetImage( Actor image )
-{
-  mLayoutContainer.RemoveChildAt( Toolkit::TableView::CellPosition( 0, 0 ) );
-  mLayoutContainer.AddChild( image, Toolkit::TableView::CellPosition( 0, 0 ) );
-
-  RelayoutRequest();
-}
-
-void RadioButton::SetButtonImage( Actor image )
-{
-  Actor& buttonImage = GetButtonImage();
-  buttonImage = image;
-}
-
-void RadioButton::SetSelectedImage( Actor image )
-{
-  Actor& selectedImage = GetSelectedImage();
-  selectedImage = image;
-}
-
 void RadioButton::OnButtonInitialize()
 {
   Actor self = Self();
 
   // Wrap size of radio button around all its children
-  self.SetResizePolicy( FIT_TO_CHILDREN, ALL_DIMENSIONS );
-
-  // Create the layout container empty at first
-  mLayoutContainer = Toolkit::TableView::New( 0, 0 );
-  mLayoutContainer.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  mLayoutContainer.SetParentOrigin( ParentOrigin::TOP_LEFT );
-  mLayoutContainer.SetResizePolicy( FIT_TO_CHILDREN, ALL_DIMENSIONS );
-  self.Add( mLayoutContainer );
+  self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
 
-  Image buttonImage = Dali::ResourceImage::New( UNSELECTED_BUTTON_IMAGE_DIR );
-  Image selectedImage = Dali::ResourceImage::New( SELECTED_BUTTON_IMAGE_DIR );
+  Image buttonImage = Dali::ResourceImage::New( UNSELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER );
+  Image selectedImage = Dali::ResourceImage::New( SELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER );
+  Image disabledImage = Dali::ResourceImage::New( DISABLED_UNSELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER );
+  Image disabledSelectedImage = Dali::ResourceImage::New( DISABLED_SELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER );
 
   SetButtonImage( ImageActor::New( buttonImage ) );
   SetSelectedImage( ImageActor::New( selectedImage ) );
-
-  SetImage( GetButtonImage() );
+  SetDisabledImage( ImageActor::New( disabledImage ) );
+  SetDisabledSelectedImage( ImageActor::New( disabledSelectedImage ) );
 
   RelayoutRequest();
 }
@@ -135,36 +112,72 @@ void RadioButton::OnLabelSet()
 
   if( label )
   {
-    // Add padding to the left of the label to create distance from the image
-    label.SetPadding( Padding( DISTANCE_BETWEEN_IMAGE_AND_LABEL, 0.0f, 0.0f, 0.0f ) );
+    label.SetParentOrigin( ParentOrigin::CENTER_LEFT );
+    label.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
 
-    mLayoutContainer.RemoveChildAt( Toolkit::TableView::CellPosition( 0, 1 ) );
-    mLayoutContainer.AddChild( label, Toolkit::TableView::CellPosition( 0, 1 ) );
+    // Radio button width is FIT_TO_CHILDREN, so the label must have a sensible policy to fill out the space
+    if( label.GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::FILL_TO_PARENT )
+    {
+      label.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
+    }
+
+    if( IsSelected() && GetSelectedImage() )
+    {
+      label.SetX( GetSelectedImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
+    }
+    else if( GetButtonImage() )
+    {
+      label.SetX( GetButtonImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
+    }
+    else
+    {
+      label.SetX( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
+    }
   }
 }
 
-void RadioButton::OnSelected( bool selected )
+void RadioButton::OnSelected()
 {
-  if( selected )
+  Actor& label = GetLabel();
+
+  PaintState paintState = GetPaintState();
+  switch( paintState )
   {
-    Actor parent = Self().GetParent();
-    if( parent )
+    case UnselectedState:
     {
-      for( unsigned int i = 0; i < parent.GetChildCount(); ++i )
+      Actor parent = Self().GetParent();
+      if( parent )
       {
-        Dali::Toolkit::RadioButton radioButtonChild = Dali::Toolkit::RadioButton::DownCast( parent.GetChildAt( i ) );
-        if( radioButtonChild )
+        for( unsigned int i = 0; i < parent.GetChildCount(); ++i )
         {
-          radioButtonChild.SetSelected( false );
+          Dali::Toolkit::RadioButton radioButtonChild = Dali::Toolkit::RadioButton::DownCast( parent.GetChildAt( i ) );
+          if( radioButtonChild && radioButtonChild != Self() )
+          {
+            radioButtonChild.SetSelected( false );
+          }
         }
       }
-    }
 
-    SetImage( GetSelectedImage() );
-  }
-  else
-  {
-    SetImage( GetButtonImage() );
+      Actor& selectedImage = GetSelectedImage();
+      if( label && selectedImage )
+      {
+        label.SetX( selectedImage.GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
+      }
+      break;
+    }
+    case SelectedState:
+    {
+      Actor& buttonImage = GetButtonImage();
+      if( label && buttonImage )
+      {
+        label.SetX( buttonImage.GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
+      }
+      break;
+    }
+    default:
+    {
+      break;
+    }
   }
 }