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=79ff3207b58ac666b3a39345875743a43c9249a5;hp=c20fe2365a566a91d95aa20f34c15dc2eb4929a0;hb=4877a7d87ba4054ad2b5a947ef9a830fe60e7096;hpb=e5dbcae1f8ee31b14d675793ab86161eeeefb029

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index c20fe23..79ff320 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -78,15 +78,16 @@ void RadioButton::OnInitialize()
   Button::OnInitialize();
 }
 
-void RadioButton::OnButtonUp()
+bool RadioButton::OnToggleReleased()
 {
-  DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "RadioButton::OnStateChange selecting:%s\n", ( (!IsSelected())?"true":"false" ) );
-
-  // Don't allow un-selection on an already selected radio button, can only un-select by selecting a sibling radio button
+  // Radio button overrides toggle release (button up) as doesn't allow un-selection to be performed on it directly.
+  bool stateChanged = false;
   if( !IsSelected() )
   {
-    SetSelected( !IsSelected() );
+    Button::SetSelected( true ); // Set button to selected as previously unselected
+    stateChanged = true;
   }
+  return stateChanged;
 }
 
 void RadioButton::OnStateChange( State newState )
@@ -94,29 +95,21 @@ void RadioButton::OnStateChange( State newState )
   // 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;
-     }
-   }
+  if ( SELECTED_STATE ==  newState )
+  {
+    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 );
+        }
+      }
+    }
+  }
 }
 
 } // namespace Internal