X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fcontrol%2Fcontrol-data-impl.cpp;h=4c747047df1f9cb19daea3ba8666378a6a3e0c21;hp=c1618f3d6d019394d2461aaed2e48fc88155f80b;hb=6da98d4f526029d51c8404964dd954afe9752401;hpb=36b6c48b03fa926529904947f222aadebbf0c1ff;ds=sidebyside diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index c1618f3..4c74704 100644 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ #include // INTERNAL INCLUDES -#include #include #include #include #include +#include #include #include #include @@ -448,7 +448,7 @@ static bool IsShowingGeometryOnScreen(Dali::Rect<> rect) Dali::Accessibility::Accessible* ExternalAccessibleGetter(Dali::Actor actor) { auto control = Toolkit::Control::DownCast(actor); - if (!control) + if(!control) { return nullptr; } @@ -483,6 +483,9 @@ const PropertyRegistration Control::Impl::PROPERTY_20(typeRegistration, "accessi const PropertyRegistration Control::Impl::PROPERTY_21(typeRegistration, "accessibilityAttributes", Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty); const PropertyRegistration Control::Impl::PROPERTY_22(typeRegistration, "dispatchKeyEvents", Toolkit::DevelControl::Property::DISPATCH_KEY_EVENTS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty); const PropertyRegistration Control::Impl::PROPERTY_23(typeRegistration, "accessibilityHidden", Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty); +const PropertyRegistration Control::Impl::PROPERTY_24(typeRegistration, "clockwiseFocusableActorId", Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty); +const PropertyRegistration Control::Impl::PROPERTY_25(typeRegistration, "counterClockwiseFocusableActorId", Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty); +const PropertyRegistration Control::Impl::PROPERTY_26(typeRegistration, "automationId", Toolkit::DevelControl::Property::AUTOMATION_ID, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty); // clang-format on @@ -494,6 +497,8 @@ Control::Impl::Impl(Control& controlImpl) mRightFocusableActorId(-1), mUpFocusableActorId(-1), mDownFocusableActorId(-1), + mClockwiseFocusableActorId(-1), + mCounterClockwiseFocusableActorId(-1), mStyleName(""), mBackgroundColor(Color::TRANSPARENT), mStartingPinchScale(nullptr), @@ -561,7 +566,7 @@ void Control::Impl::CheckHighlightedObjectGeometry() auto accessible = GetAccessibleObject(); auto lastPosition = accessible->GetLastPosition(); auto accessibleRect = accessible->GetExtents(Dali::Accessibility::CoordinateType::WINDOW); - auto rect = GetShowingGeometry(accessibleRect, accessible); + auto rect = GetShowingGeometry(accessibleRect, accessible); switch(mAccessibilityLastScreenRelativeMoveType) { @@ -622,9 +627,9 @@ void Control::Impl::RegisterAccessibilityPositionPropertyNotification() mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::OUTSIDE; // recalculate mAccessibilityLastScreenRelativeMoveType accordingly to the initial position CheckHighlightedObjectGeometry(); - mAccessibilityPositionNotification = mControlImpl.Self().AddPropertyNotification(Actor::Property::WORLD_POSITION, StepCondition(1.0f, 1.0f)); + mAccessibilityPositionNotification = mControlImpl.Self().AddPropertyNotification(Actor::Property::WORLD_POSITION, StepCondition(1.0f, 1.0f)); mAccessibilityPositionNotification.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED); - mAccessibilityPositionNotification.NotifySignal().Connect(this, [this](PropertyNotification&){ CheckHighlightedObjectGeometry(); }); + mAccessibilityPositionNotification.NotifySignal().Connect(this, [this](PropertyNotification&) { CheckHighlightedObjectGeometry(); }); mIsAccessibilityPositionPropertyNotificationSet = true; } @@ -963,6 +968,11 @@ void Control::Impl::NotifyVisualEvent(Visual::Base& object, Property::Index sign } } +void Control::Impl::RelayoutRequest(Visual::Base& object) +{ + mControlImpl.RelayoutRequest(); +} + bool Control::Impl::IsResourceReady() const { // Iterate through and check all the enabled visuals are ready @@ -1086,6 +1096,15 @@ void Control::Impl::DoAction(Dali::Property::Index visualIndex, Dali::Property:: } } +void Control::Impl::DoActionExtension(Dali::Property::Index visualIndex, Dali::Property::Index actionId, Dali::Any attributes) +{ + RegisteredVisualContainer::Iterator iter; + if(FindVisual(visualIndex, mVisuals, iter)) + { + Toolkit::GetImplementation((*iter)->visual).DoActionExtension(actionId, attributes); + } +} + void Control::Impl::AppendAccessibilityAttribute(const std::string& key, const std::string value) { Property::Value* checkedValue = mAccessibilityAttributes.Find(key); @@ -1360,13 +1379,41 @@ void Control::Impl::SetProperty(BaseObject* object, Property::Index index, const auto* accessible = controlImpl.GetAccessibleObject(); auto* parent = dynamic_cast(accessible->GetParent()); - if (parent) + if(parent) { parent->OnChildrenChanged(); } } break; } + case Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID: + { + int focusId; + if(value.Get(focusId)) + { + controlImpl.mImpl->mClockwiseFocusableActorId = focusId; + } + break; + } + case Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID: + { + int focusId; + if(value.Get(focusId)) + { + controlImpl.mImpl->mCounterClockwiseFocusableActorId = focusId; + } + break; + } + + case Toolkit::DevelControl::Property::AUTOMATION_ID: + { + std::string automationId; + if(value.Get(automationId)) + { + controlImpl.mImpl->mAutomationId = automationId; + } + break; + } } } } @@ -1527,6 +1574,24 @@ Property::Value Control::Impl::GetProperty(BaseObject* object, Property::Index i value = controlImpl.mImpl->mAccessibilityHidden; break; } + + case Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID: + { + value = controlImpl.mImpl->mClockwiseFocusableActorId; + break; + } + + case Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID: + { + value = controlImpl.mImpl->mCounterClockwiseFocusableActorId; + break; + } + + case Toolkit::DevelControl::Property::AUTOMATION_ID: + { + value = controlImpl.mImpl->mAutomationId; + break; + } } } @@ -1959,7 +2024,8 @@ Dali::Property Control::Impl::GetVisualProperty(Dali::Property::Index index, Dal void Control::Impl::CreateTransitions(std::vector>& sourceProperties, std::vector>& destinationProperties, - Dali::Toolkit::Control source, Dali::Toolkit::Control destination) + Dali::Toolkit::Control source, + Dali::Toolkit::Control destination) { // Retrieves background properties to be transitioned. Dali::Property::Map backgroundSourcePropertyMap, backgroundDestinationPropertyMap;