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=3276076f6248143dd9aec496ebb563572499a6e9;hp=c20fe2365a566a91d95aa20f34c15dc2eb4929a0;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;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..3276076 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -22,7 +22,6 @@
 // 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;
@@ -76,17 +75,17 @@ RadioButton::~RadioButton()
 void RadioButton::OnInitialize()
 {
   Button::OnInitialize();
+
+  DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+    return std::unique_ptr< Dali::Accessibility::Accessible >(
+      new AccessibleImpl( actor, Dali::Accessibility::Role::RADIO_BUTTON ) );
+  } );
 }
 
-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
-  if( !IsSelected() )
-  {
-    SetSelected( !IsSelected() );
-  }
+  // Radio button overrides toggle release (button up) as doesn't allow un-selection to be performed on it directly.
+  return false;
 }
 
 void RadioButton::OnStateChange( State newState )
@@ -94,29 +93,38 @@ 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.SetProperty( Toolkit::Button::Property::SELECTED, false );
+        }
+      }
+    }
+  }
+  // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used
+  if (Dali::Accessibility::IsUp() && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
+  {
+    Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(
+      Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0
+    );
+  }
+}
+
+Dali::Accessibility::States RadioButton::AccessibleImpl::CalculateStates()
+{
+  auto tmp = Button::AccessibleImpl::CalculateStates();
+  auto slf = Toolkit::Button::DownCast( self );
+  if( slf.GetProperty<bool>( Toolkit::Button::Property::SELECTED ) )
+    tmp[Dali::Accessibility::State::CHECKED] = true;
+  tmp[Dali::Accessibility::State::SELECTABLE] = true;
+  return tmp;
 }
 
 } // namespace Internal