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=15ac51a5dc6f3708d5b169b38bc23571493c73ac;hp=9921663ca2eef7f570411f7dcb9cb404e3de3e49;hb=2f976883ceece5f26123a64f85ef068c25ddfa90;hpb=cd224fa3b170c7cab0f4033e751bf4211e9c84f2

diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
index 9921663..15ac51a 100644
--- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
@@ -377,14 +377,37 @@ 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>();
+}
+
 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);
+    }
   }
 }