From 8ede67ef1899f027d3b487b2defbe8be87b7f528 Mon Sep 17 00:00:00 2001 From: Bartlomiej Grzelewski Date: Wed, 14 Apr 2021 14:45:31 +0200 Subject: [PATCH 1/1] [AT-SPI] Set default value of ReadingInfoTypes Change-Id: I58c437e75749cd9f6307e68a2aa863bde93f95ac --- .../utc-Dali-Accessibility-Controls-BridgeUp.cpp | 16 ++++++++++++++++ .../internal/controls/control/control-data-impl.cpp | 9 +++++++++ 2 files changed, 25 insertions(+) diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp index c68e84f..fdd8f10 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp @@ -460,6 +460,22 @@ int UtcDaliControlReadingInfoType(void) auto control = Control::New(); auto reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control); + + for ( auto i = 0u; i < 4; ++i) + DALI_TEST_CHECK ( reading_info_type[ static_cast< Dali::Accessibility::ReadingInfoType >( i ) ]); + + reading_info_type[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = false; + reading_info_type[Dali::Accessibility::ReadingInfoType::STATE] = false; + reading_info_type[Dali::Accessibility::ReadingInfoType::NAME] = false; + reading_info_type[Dali::Accessibility::ReadingInfoType::ROLE] = false; + + DevelControl::SetAccessibilityReadingInfoType(control, reading_info_type); + + reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control); + + for ( auto i = 0u; i < 4; ++i) + DALI_TEST_CHECK ( false == reading_info_type[ static_cast< Dali::Accessibility::ReadingInfoType >( i ) ]); + reading_info_type[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = true; reading_info_type[Dali::Accessibility::ReadingInfoType::STATE] = true; reading_info_type[Dali::Accessibility::ReadingInfoType::NAME] = true; diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index 070fa82..4e2a1c6 100644 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -1471,6 +1471,15 @@ Dali::Accessibility::ReadingInfoTypes Control::Impl::GetAccessibilityReadingInfo { place->Get(value); } + else + { + Dali::Accessibility::ReadingInfoTypes types; + types[Dali::Accessibility::ReadingInfoType::NAME] = true; + types[Dali::Accessibility::ReadingInfoType::ROLE] = true; + types[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = true; + types[Dali::Accessibility::ReadingInfoType::STATE] = true; + return types; + } if(value.empty()) { -- 2.7.4