From 5887b44da70bc6696cbe437d0f85c71dab254bc8 Mon Sep 17 00:00:00 2001 From: Bartlomiej Grzelewski Date: Thu, 22 Oct 2020 16:11:18 +0200 Subject: [PATCH] [AT-SPI] Correct VISIBLE and SHOWING states Change-Id: Ia11883054ec19b83c511ff06e2de6e07a10099a8 --- dali-toolkit/internal/controls/control/control-data-impl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index d8b044c..df01b27 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -2012,12 +2012,14 @@ Dali::Accessibility::States Control::Impl::AccessibleImpl::CalculateStates() s[Dali::Accessibility::State::ENABLED] = true; s[Dali::Accessibility::State::SENSITIVE] = true; s[Dali::Accessibility::State::ANIMATED] = self.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ANIMATED ).Get< bool >(); - s[Dali::Accessibility::State::VISIBLE] = self.GetCurrentProperty< bool >( Actor::Property::VISIBLE ); + s[Dali::Accessibility::State::VISIBLE] = true; if( modal ) { s[Dali::Accessibility::State::MODAL] = true; } - s[Dali::Accessibility::State::SHOWING] = !self.GetProperty( Dali::DevelActor::Property::CULLED ).Get< bool >(); + s[Dali::Accessibility::State::SHOWING] = !self.GetProperty( Dali::DevelActor::Property::CULLED ).Get< bool >() + && self.GetCurrentProperty< bool >( Actor::Property::VISIBLE ); + s[Dali::Accessibility::State::DEFUNCT] = !self.GetProperty( Dali::DevelActor::Property::CONNECTED_TO_SCENE ).Get< bool >(); return s; } -- 2.7.4