X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fradio-button-impl.cpp;h=739972a336ad35e3fe239a0568498a495ae09837;hb=refs%2Fchanges%2F00%2F44400%2F3;hp=96b588cc171297fbbeaae0f3596f6586945c65b7;hpb=a41a75fa9679db6703affe8870af6e1eb6bcfc48;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index 96b588c..739972a 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -44,6 +44,8 @@ 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 );
 }
@@ -77,13 +79,12 @@ void RadioButton::OnButtonInitialize()
   Actor self = Self();
 
   // Wrap size of radio button around all its children
-  self.SetResizePolicy( FIT_TO_CHILDREN, ALL_DIMENSIONS );
+  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 );
-
-  SetButtonImage( ImageActor::New( buttonImage ) );
-  SetSelectedImage( ImageActor::New( selectedImage ) );
+  SetUnselectedImage( UNSELECTED_BUTTON_IMAGE_DIR );
+  SetSelectedImage( SELECTED_BUTTON_IMAGE_DIR );
+  SetDisabledImage( DISABLED_UNSELECTED_BUTTON_IMAGE_DIR );
+  SetDisabledSelectedImage( DISABLED_SELECTED_BUTTON_IMAGE_DIR );
 
   RelayoutRequest();
 }
@@ -102,32 +103,39 @@ void RadioButton::OnButtonUp()
 
 void RadioButton::OnLabelSet()
 {
-  Actor& label = GetLabel();
+  Actor& label = GetLabelActor();
 
   if( label )
   {
     label.SetParentOrigin( ParentOrigin::CENTER_LEFT );
     label.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
 
-    if( IsSelected() )
+    // 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( GetUnselectedImage() )
+    {
+      label.SetX( GetUnselectedImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
+    }
     else
     {
-      label.SetX( GetButtonImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
+      label.SetX( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
     }
   }
 }
 
-bool RadioButton::OnSelected()
+void RadioButton::OnSelected()
 {
-  Actor& buttonImage = GetButtonImage();
-  Actor& selectedImage = GetSelectedImage();
-  Actor& label = GetLabel();
+  Actor& label = GetLabelActor();
 
   PaintState paintState = GetPaintState();
-
   switch( paintState )
   {
     case UnselectedState:
@@ -145,9 +153,8 @@ bool RadioButton::OnSelected()
         }
       }
 
-      RemoveChild( buttonImage );
-
-      if( label )
+      Actor& selectedImage = GetSelectedImage();
+      if( label && selectedImage )
       {
         label.SetX( selectedImage.GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
       }
@@ -155,9 +162,8 @@ bool RadioButton::OnSelected()
     }
     case SelectedState:
     {
-      RemoveChild( selectedImage );
-
-      if( label )
+      Actor& buttonImage = GetUnselectedImage();
+      if( label && buttonImage )
       {
         label.SetX( buttonImage.GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
       }
@@ -168,9 +174,6 @@ bool RadioButton::OnSelected()
       break;
     }
   }
-
-  // there is no animation
-  return false;
 }
 
 } // namespace Internal