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=3010e694b90be2d0bd4e9173df67b016613a2be2;hp=311f6b3b25da8ae2eaded88efb1563f21172ddfc;hb=70fdb1a1e8e2660c383079ae49bc94fbe14943d1;hpb=19b6edb066bc90ab6fd4ce93b9dc49b5224d7815 diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp index 311f6b3..3010e69 100644 --- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp @@ -377,11 +377,13 @@ Dali::Accessibility::States ToggleButton::AccessibleImpl::CalculateStates() auto states = Button::AccessibleImpl::CalculateStates(); auto button = Toolkit::ToggleButton::DownCast(Self()); if(button.GetProperty(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX)) + { states[Dali::Accessibility::State::CHECKED] = true; + } return states; } -std::string ToggleButton::AccessibleImpl::GetDescriptionRaw() +std::string ToggleButton::AccessibleImpl::GetDescriptionRaw() const { auto button = Toolkit::ToggleButton::DownCast(Self()); auto index = button.GetProperty(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX); @@ -401,9 +403,8 @@ void ToggleButton::OnStateChange(State newState) if(Dali::Accessibility::IsUp() && (Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE)) { - Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged( - Dali::Accessibility::State::CHECKED, mCurrentToggleIndex ? 1 : 0, 0); - Dali::Accessibility::Accessible::Get(Self())->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::DESCRIPTION); + Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, mCurrentToggleIndex ? 1 : 0, 0); + Dali::Accessibility::Accessible::Get(Self())->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::DESCRIPTION); } }