X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Faccessible-impl.cpp;h=5f2a15732d753b80d3f7165d25f5c61eb1597924;hp=be4735b211ea4e6807930766a375dc90e045fef9;hb=5005e599ae0a49d2bd92f001be5fce4f85ebe3f0;hpb=396e6317556d73a06f49b0e26aac8fd6c1866ec2 diff --git a/dali-toolkit/devel-api/controls/accessible-impl.cpp b/dali-toolkit/devel-api/controls/accessible-impl.cpp index be4735b..5f2a157 100644 --- a/dali-toolkit/devel-api/controls/accessible-impl.cpp +++ b/dali-toolkit/devel-api/controls/accessible-impl.cpp @@ -19,6 +19,10 @@ #include "accessible-impl.h" // EXTERNAL INCLUDES +#ifdef DGETTEXT_ENABLED +#include +#endif + #include // INTERNAL INCLUDES @@ -31,19 +35,30 @@ namespace Dali::Toolkit::DevelControl { +static std::string GetLocaleText(std::string string, const char *domain = "dali-toolkit") +{ +#ifdef DGETTEXT_ENABLED + /*TODO: currently non-localized string is used as a key for translation lookup. In case the lookup key formatting is forced + consider calling utility function for converting non-localized string into well-formatted key before lookup. */ + return dgettext(domain, string.c_str()); +#else + return string; +#endif +} + AccessibleImpl::AccessibleImpl(Dali::Actor self, Dali::Accessibility::Role role, bool modal) : self(self), modal(modal) { - auto control = Dali::Toolkit::Control::DownCast(self); + auto control = Dali::Toolkit::Control::DownCast(Self()); Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control); Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get(internalControl); if(controlImpl.mAccessibilityRole == Dali::Accessibility::Role::UNKNOWN) controlImpl.mAccessibilityRole = role; - self.PropertySetSignal().Connect(&controlImpl, [this, &controlImpl](Dali::Handle& handle, Dali::Property::Index index, Dali::Property::Value value) { - if(this->self != Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor()) + Self().PropertySetSignal().Connect(&controlImpl, [this, &controlImpl](Dali::Handle& handle, Dali::Property::Index index, Dali::Property::Value value) { + if(this->Self() != Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor()) { return; } @@ -68,25 +83,35 @@ AccessibleImpl::AccessibleImpl(Dali::Actor self, Dali::Accessibility::Role role, std::string AccessibleImpl::GetName() { - auto control = Dali::Toolkit::Control::DownCast(self); + auto control = Dali::Toolkit::Control::DownCast(Self()); Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control); Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get(internalControl); + std::string name; if(!controlImpl.mAccessibilityGetNameSignal.Empty()) { - std::string ret; - controlImpl.mAccessibilityGetNameSignal.Emit(ret); - return ret; + controlImpl.mAccessibilityGetNameSignal.Emit(name); + } + else if(controlImpl.mAccessibilityNameSet) + { + name = controlImpl.mAccessibilityName; + } + else if(auto raw = GetNameRaw(); !raw.empty()) + { + name = raw; + } + else + { + name = Self().GetProperty(Actor::Property::NAME); } - if(controlImpl.mAccessibilityNameSet) - return controlImpl.mAccessibilityName; - - if(auto raw = GetNameRaw(); !raw.empty()) - return raw; + if(controlImpl.mAccessibilityTranslationDomainSet) + { + return GetLocaleText(name, controlImpl.mAccessibilityTranslationDomain.c_str()); + } - return self.GetProperty(Actor::Property::NAME); + return GetLocaleText(name); } std::string AccessibleImpl::GetNameRaw() @@ -96,47 +121,55 @@ std::string AccessibleImpl::GetNameRaw() std::string AccessibleImpl::GetDescription() { - auto control = Dali::Toolkit::Control::DownCast(self); + auto control = Dali::Toolkit::Control::DownCast(Self()); Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control); Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get(internalControl); + std::string description; if(!controlImpl.mAccessibilityGetDescriptionSignal.Empty()) { - std::string ret; - controlImpl.mAccessibilityGetDescriptionSignal.Emit(ret); - return ret; + controlImpl.mAccessibilityGetDescriptionSignal.Emit(description); + } + else if(controlImpl.mAccessibilityDescriptionSet) + { + description = controlImpl.mAccessibilityDescription; + } + else + { + description = GetDescriptionRaw(); + } + if(controlImpl.mAccessibilityTranslationDomainSet) + { + return GetLocaleText(description, controlImpl.mAccessibilityTranslationDomain.c_str()); } - if(controlImpl.mAccessibilityDescriptionSet) - return controlImpl.mAccessibilityDescription; - - return GetDescriptionRaw(); + return GetLocaleText(description); } std::string AccessibleImpl::GetDescriptionRaw() { - return ""; + return {}; } Dali::Accessibility::Accessible* AccessibleImpl::GetParent() { - return Dali::Accessibility::Accessible::Get(self.GetParent()); + return Dali::Accessibility::Accessible::Get(Self().GetParent()); } size_t AccessibleImpl::GetChildCount() { - return self.GetChildCount(); + return Self().GetChildCount(); } Dali::Accessibility::Accessible* AccessibleImpl::GetChildAtIndex(size_t index) { - return Dali::Accessibility::Accessible::Get(self.GetChildAt(static_cast(index))); + return Dali::Accessibility::Accessible::Get(Self().GetChildAt(static_cast(index))); } size_t AccessibleImpl::GetIndexInParent() { - auto s = self; + auto s = Self(); auto parent = s.GetParent(); DALI_ASSERT_ALWAYS(parent && "can't call GetIndexInParent on object without parent"); auto count = parent.GetChildCount(); @@ -152,11 +185,17 @@ size_t AccessibleImpl::GetIndexInParent() Dali::Accessibility::Role AccessibleImpl::GetRole() { - return self.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE); + return Self().GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE); +} + +std::string AccessibleImpl::GetLocalizedRoleName() +{ + return GetLocaleText(GetRoleName()); } Dali::Accessibility::States AccessibleImpl::CalculateStates() { + Dali::Actor self = Self(); Dali::Accessibility::States s; s[Dali::Accessibility::State::FOCUSABLE] = self.GetProperty(Actor::Property::KEYBOARD_FOCUSABLE); s[Dali::Accessibility::State::FOCUSED] = Toolkit::KeyboardFocusManager::Get().GetCurrentFocusActor() == self; @@ -167,7 +206,6 @@ Dali::Accessibility::States AccessibleImpl::CalculateStates() s[Dali::Accessibility::State::HIGHLIGHTED] = GetCurrentlyHighlightedActor() == self; 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(); s[Dali::Accessibility::State::VISIBLE] = true; if(modal) { @@ -187,7 +225,7 @@ Dali::Accessibility::States AccessibleImpl::GetStates() Dali::Accessibility::Attributes AccessibleImpl::GetAttributes() { std::unordered_map attribute_map; - auto q = Dali::Toolkit::Control::DownCast(self); + auto q = Dali::Toolkit::Control::DownCast(Self()); auto w = q.GetProperty(Dali::Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES); auto z = w.GetMap(); @@ -221,6 +259,7 @@ Dali::Accessibility::ComponentLayer AccessibleImpl::GetLayer() Dali::Rect<> AccessibleImpl::GetExtents(Dali::Accessibility::CoordType ctype) { + Dali::Actor self = Self(); Vector2 screenPosition = self.GetProperty(Dali::DevelActor::Property::SCREEN_POSITION) .Get(); @@ -248,7 +287,7 @@ double AccessibleImpl::GetAlpha() bool AccessibleImpl::GrabFocus() { - return Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor(self); + return Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor(Self()); } static Dali::Actor CreateHighlightIndicatorActor() @@ -259,15 +298,32 @@ static Dali::Actor CreateHighlightIndicatorActor() // keyboard focusable actors auto actor = Toolkit::ImageView::New(focusBorderImagePath); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - DevelControl::AppendAccessibilityAttribute(actor, "highlight", ""); - actor.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ANIMATED, true); + DevelControl::AppendAccessibilityAttribute(actor, "highlight", std::string()); actor.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, false); return actor; } +void AccessibleImpl::ScrollToSelf() +{ + auto* child = this; + auto* parent = dynamic_cast(child->GetParent()); + + while (parent) + { + if (parent->IsScrollable()) + { + parent->ScrollToChild(child->Self()); + } + + child = parent; + parent = dynamic_cast(parent->GetParent()); + } +} + bool AccessibleImpl::GrabHighlight() { + Dali::Actor self = Self(); auto old = GetCurrentlyHighlightedActor(); if(!Dali::Accessibility::IsUp()) @@ -294,7 +350,7 @@ bool AccessibleImpl::GrabHighlight() // Remember the highlight actor, so that when the default is changed with // SetHighlightActor(), the currently displayed highlight can still be cleared. currentHighlightActor = highlight; - EnsureSelfVisible(); + ScrollToSelf(); self.Add(highlight); SetCurrentlyHighlightedActor(self); EmitHighlighted(true); @@ -304,6 +360,8 @@ bool AccessibleImpl::GrabHighlight() bool AccessibleImpl::ClearHighlight() { + Dali::Actor self = Self(); + if(!Dali::Accessibility::IsUp()) return false; if(GetCurrentlyHighlightedActor() == self) @@ -319,51 +377,50 @@ bool AccessibleImpl::ClearHighlight() std::string AccessibleImpl::GetActionName(size_t index) { - if(index >= GetActionCount()) return ""; + if(index >= GetActionCount()) return {}; Dali::TypeInfo type; - self.GetTypeInfo(type); + Self().GetTypeInfo(type); DALI_ASSERT_ALWAYS(type && "no TypeInfo object"); return type.GetActionName(index); } std::string AccessibleImpl::GetLocalizedActionName(size_t index) { - // TODO: add localization - return GetActionName(index); + return GetLocaleText(GetActionName(index)); } std::string AccessibleImpl::GetActionDescription(size_t index) { - return ""; + return {}; } size_t AccessibleImpl::GetActionCount() { Dali::TypeInfo type; - self.GetTypeInfo(type); + Self().GetTypeInfo(type); DALI_ASSERT_ALWAYS(type && "no TypeInfo object"); return type.GetActionCount(); } std::string AccessibleImpl::GetActionKeyBinding(size_t index) { - return ""; + return {}; } bool AccessibleImpl::DoAction(size_t index) { std::string actionName = GetActionName(index); - return self.DoAction(actionName, {}); + return Self().DoAction(actionName, {}); } bool AccessibleImpl::DoAction(const std::string& name) { - return self.DoAction(name, {}); + return Self().DoAction(name, {}); } bool AccessibleImpl::DoGesture(const Dali::Accessibility::GestureInfo& gestureInfo) { - auto control = Dali::Toolkit::Control::DownCast(self); + auto control = Dali::Toolkit::Control::DownCast(Self()); Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control); Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get(internalControl); @@ -380,7 +437,7 @@ bool AccessibleImpl::DoGesture(const Dali::Accessibility::GestureInfo& gestureIn std::vector AccessibleImpl::GetRelationSet() { - auto control = Dali::Toolkit::Control::DownCast(self); + auto control = Dali::Toolkit::Control::DownCast(Self()); Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control); Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get(internalControl); @@ -399,17 +456,9 @@ std::vector AccessibleImpl::GetRelationSet() return ret; } -void AccessibleImpl::EnsureChildVisible(Actor child) +bool AccessibleImpl::ScrollToChild(Actor child) { -} - -void AccessibleImpl::EnsureSelfVisible() -{ - auto parent = dynamic_cast(GetParent()); - if(parent) - { - parent->EnsureChildVisible(self); - } + return false; } Dali::Property::Index AccessibleImpl::GetNamePropertyIndex()