From: Artur Świgoń Date: Thu, 3 Sep 2020 10:21:39 +0000 (+0200) Subject: [AT-SPI] Make Accessible::GetName() fall back to actor name X-Git-Tag: dali_2.0.0~6^2~35 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6d14fa68a496022399d7e7b2efa67f17c6fcfb79 [AT-SPI] Make Accessible::GetName() fall back to actor name Change-Id: I9042919ea99759a6b5c0bc60e19e6858ca0c078b --- diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index 3914e6a..4d7c6e4 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -1907,12 +1907,15 @@ std::string Control::Impl::AccessibleImpl::GetName() if (controlImpl.mAccessibilityNameSet) return controlImpl.mAccessibilityName; - return GetNameRaw(); + if (auto raw = GetNameRaw(); !raw.empty()) + return raw; + + return self.GetProperty< std::string >( Actor::Property::NAME ); } std::string Control::Impl::AccessibleImpl::GetNameRaw() { - return self.GetProperty< std::string >( Actor::Property::NAME ); + return {}; } std::string Control::Impl::AccessibleImpl::GetDescription()