From fece356024bc81a7b93a1f0d7e04a9de9b2f3e7b Mon Sep 17 00:00:00 2001 From: Maria Bialota Date: Wed, 7 Oct 2020 14:28:24 +0200 Subject: [PATCH] [AT-SPI] Fixed unreachable condition and counting of selected children Change-Id: I6fa871a438b7ecf7bc07151209bd3aa1d1f4142b --- dali/internal/accessibility/bridge/bridge-accessible.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dali/internal/accessibility/bridge/bridge-accessible.cpp b/dali/internal/accessibility/bridge/bridge-accessible.cpp index 8168c0c..03a6677 100644 --- a/dali/internal/accessibility/bridge/bridge-accessible.cpp +++ b/dali/internal/accessibility/bridge/bridge-accessible.cpp @@ -287,7 +287,7 @@ BridgeAccessible::ReadingMaterialType BridgeAccessible::GetReadingMaterial() auto indexInParent = static_cast< int32_t >( self->GetIndexInParent() ); bool isSelectedInParent = false; bool hasCheckBoxChild = false; - int32_t firstSelectedChildIndex = 0; + int32_t firstSelectedChildIndex = -1; int32_t selectedChildCount = 0; for( auto i = 0u; i < static_cast< size_t >( childCount ); ++i ) @@ -296,9 +296,9 @@ BridgeAccessible::ReadingMaterialType BridgeAccessible::GetReadingMaterial() auto s = q->GetStates(); if( s[State::SELECTABLE] ) { - ++selectedChildCount; if( s[State::SELECTED] ) { + ++selectedChildCount; if( firstSelectedChildIndex < 0 ) firstSelectedChildIndex = static_cast< int32_t >( i ); } -- 2.7.4