[AT-SPI] Support reading states and tooltips of ToggleButton

Change-Id: I71f84e5cde9734dc80d8f7fc65c75d1e94f5e178

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 (file)
--- 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();
 }
 
   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(
 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);
+    }

   }
 }
 
   }
 }
 

diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.h b/dali-toolkit/internal/controls/buttons/toggle-button-impl.h
index 30af228..7609773 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.h
@@ -164,6 +164,13 @@ private:
   std::vector<std::string> mToggleTooltips;               ///< Toggle tooltips.
   unsigned int             mCurrentToggleIndex;       ///< The index of state.
 protected:
   std::vector<std::string> mToggleTooltips;               ///< Toggle tooltips.
   unsigned int             mCurrentToggleIndex;       ///< The index of state.
 protected:

+  struct AccessibleImpl : public Button::AccessibleImpl
+  {
+    using Button::AccessibleImpl::AccessibleImpl;
+
+    Dali::Accessibility::States CalculateStates() override;
+    std::string GetDescriptionRaw() override;
+  };

   void OnStateChange( State newState ) override;
 };
 
   void OnStateChange( State newState ) override;
 };