X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Ftoggle-button-impl.cpp;h=a756a22e71796395bc6386cdf7e615c586b845c0;hp=a3c44644f14c547f976ec94662aac9a59a548be4;hb=e3d6a0a27fd980a4ced6e7257abdc32bc192e871;hpb=8a647e87a01c5c78451653c1264a9eea81ac9b20

diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
index a3c4464..a756a22 100644
--- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
@@ -96,10 +96,6 @@ ToggleButton::ToggleButton()
 {
   DALI_LOG_INFO( gLogButtonFilter, Debug::General, "ToggleButton::Constructor\n" );
   SetTogglableButton( false );
-  DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::TOGGLE_BUTTON ) );
-  } );
 }
 
 ToggleButton::~ToggleButton()
@@ -114,6 +110,11 @@ void ToggleButton::OnInitialize()
   // Toggle button requires the Leave event.
   Actor self = Self();
   self.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
+
+  DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+    return std::unique_ptr< Dali::Accessibility::Accessible >(
+      new AccessibleImpl( actor, Dali::Accessibility::Role::TOGGLE_BUTTON ) );
+  } );
 }
 
 void ToggleButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
@@ -376,14 +377,42 @@ void ToggleButton::OnPressed()
   RelayoutRequest();
 }
 
+Dali::Accessibility::States ToggleButton::AccessibleImpl::CalculateStates()
+{
+  auto states = Button::AccessibleImpl::CalculateStates();
+  auto button = Toolkit::ToggleButton::DownCast( self );
+  if( button.GetProperty<int>( Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX ) )
+    states[Dali::Accessibility::State::CHECKED] = true;
+  return states;
+}
+
+std::string ToggleButton::AccessibleImpl::GetDescriptionRaw()
+{
+  auto button = Toolkit::ToggleButton::DownCast( self );
+  auto index = button.GetProperty<int>( Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX );
+  auto tooltips = button.GetProperty<Property::Array>( Toolkit::ToggleButton::Property::TOOLTIPS );
+
+  return tooltips[index].Get<std::string>();
+}
+
+Property::Index ToggleButton::AccessibleImpl::GetDescriptionPropertyIndex()
+{
+  return Toolkit::ToggleButton::Property::TOOLTIPS;
+}
+
 void ToggleButton::OnStateChange( State newState )
 {
   // 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::State::CHECKED, mCurrentToggleIndex ? 1 : 0, 0
     );
+
+    if(Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor())
+    {
+      Dali::Accessibility::Accessible::Get(Self())->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::DESCRIPTION);
+    }
   }
 }