/*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
#include "control-data-impl.h"
// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/controls/control.h>
#include <dali-toolkit/public-api/dali-toolkit-common.h>
-#include <dali/integration-api/debug.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/adaptor-framework/accessibility.h>
+#include <dali/devel-api/common/stage.h>
#include <dali/devel-api/object/handle-devel.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/object-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <cstring>
#include <limits>
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-base-impl.h>
-#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/devel-api/controls/control-wrapper-impl.h>
#include <dali-toolkit/internal/styling/style-manager-impl.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
-namespace Dali
+namespace
{
+const std::string READING_INFO_TYPE_NAME = "name";
+const std::string READING_INFO_TYPE_ROLE = "role";
+const std::string READING_INFO_TYPE_DESCRIPTION = "description";
+const std::string READING_INFO_TYPE_STATE = "state";
+const std::string READING_INFO_TYPE_ATTRIBUTE_NAME = "reading_info_type";
+const std::string READING_INFO_TYPE_SEPARATOR = "|";
+} // namespace
+namespace Dali
+{
namespace Toolkit
{
-
namespace Internal
{
-
extern const Dali::Scripting::StringEnum ControlStateTable[];
-extern const unsigned int ControlStateTableCount;
-
+extern const unsigned int ControlStateTableCount;
// Not static or anonymous - shared with other translation units
const Scripting::StringEnum ControlStateTable[] = {
- { "NORMAL", Toolkit::DevelControl::NORMAL },
- { "FOCUSED", Toolkit::DevelControl::FOCUSED },
- { "DISABLED", Toolkit::DevelControl::DISABLED },
+ {"NORMAL", Toolkit::DevelControl::NORMAL},
+ {"FOCUSED", Toolkit::DevelControl::FOCUSED},
+ {"DISABLED", Toolkit::DevelControl::DISABLED},
};
-const unsigned int ControlStateTableCount = sizeof( ControlStateTable ) / sizeof( ControlStateTable[0] );
-
-
+const unsigned int ControlStateTableCount = sizeof(ControlStateTable) / sizeof(ControlStateTable[0]);
namespace
{
-
#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_CONTROL_VISUALS");
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_CONTROL_VISUALS");
#endif
-
template<typename T>
-void Remove( Dictionary<T>& keyValues, const std::string& name )
+void Remove(Dictionary<T>& keyValues, const std::string& name)
{
keyValues.Remove(name);
}
-void Remove( DictionaryKeys& keys, const std::string& name )
+void Remove(DictionaryKeys& keys, const std::string& name)
{
- DictionaryKeys::iterator iter = std::find( keys.begin(), keys.end(), name );
- if( iter != keys.end())
+ DictionaryKeys::iterator iter = std::find(keys.begin(), keys.end(), name);
+ if(iter != keys.end())
{
keys.erase(iter);
}
}
-Toolkit::Visual::Type GetVisualTypeFromMap( const Property::Map& map )
+/**
+ * Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter
+ */
+bool FindVisual(Property::Index targetIndex, const RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter)
{
- Property::Value* typeValue = map.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE );
- Toolkit::Visual::Type type = Toolkit::Visual::IMAGE;
- if( typeValue )
+ for(iter = visuals.Begin(); iter != visuals.End(); iter++)
{
- Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, type );
+ if((*iter)->index == targetIndex)
+ {
+ return true;
+ }
}
- return type;
+ return false;
}
/**
* Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter
*/
-bool FindVisual( Property::Index targetIndex, const RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter )
+bool FindVisual(std::string visualName, const RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter)
{
- for ( iter = visuals.Begin(); iter != visuals.End(); iter++ )
+ for(iter = visuals.Begin(); iter != visuals.End(); iter++)
{
- if ( (*iter)->index == targetIndex )
+ Toolkit::Visual::Base visual = (*iter)->visual;
+ if(visual && visual.GetName() == visualName)
{
return true;
}
return false;
}
-void FindChangableVisuals( Dictionary<Property::Map>& stateVisualsToAdd,
- Dictionary<Property::Map>& stateVisualsToChange,
- DictionaryKeys& stateVisualsToRemove)
+void FindChangableVisuals(Dictionary<Property::Map>& stateVisualsToAdd,
+ Dictionary<Property::Map>& stateVisualsToChange,
+ DictionaryKeys& stateVisualsToRemove)
{
DictionaryKeys copyOfStateVisualsToRemove = stateVisualsToRemove;
- for( DictionaryKeys::iterator iter = copyOfStateVisualsToRemove.begin();
- iter != copyOfStateVisualsToRemove.end(); ++iter )
+ for(DictionaryKeys::iterator iter = copyOfStateVisualsToRemove.begin();
+ iter != copyOfStateVisualsToRemove.end();
+ ++iter)
{
const std::string& visualName = (*iter);
- Property::Map* toMap = stateVisualsToAdd.Find( visualName );
- if( toMap )
+ Property::Map* toMap = stateVisualsToAdd.Find(visualName);
+ if(toMap)
{
- stateVisualsToChange.Add( visualName, *toMap );
- stateVisualsToAdd.Remove( visualName );
- Remove( stateVisualsToRemove, visualName );
+ stateVisualsToChange.Add(visualName, *toMap);
+ stateVisualsToAdd.Remove(visualName);
+ Remove(stateVisualsToRemove, visualName);
}
}
}
Toolkit::Visual::Base GetVisualByName(
const RegisteredVisualContainer& visuals,
- const std::string& visualName )
+ const std::string& visualName)
{
Toolkit::Visual::Base visualHandle;
RegisteredVisualContainer::Iterator iter;
- for ( iter = visuals.Begin(); iter != visuals.End(); iter++ )
+ for(iter = visuals.Begin(); iter != visuals.End(); iter++)
{
Toolkit::Visual::Base visual = (*iter)->visual;
- if( visual && visual.GetName() == visualName )
+ if(visual && visual.GetName() == visualName)
{
visualHandle = visual;
break;
return visualHandle;
}
+Toolkit::Visual::Base GetVisualByIndex(
+ const RegisteredVisualContainer& visuals,
+ Property::Index index)
+{
+ Toolkit::Visual::Base visualHandle;
+
+ RegisteredVisualContainer::Iterator iter;
+ for(iter = visuals.Begin(); iter != visuals.End(); iter++)
+ {
+ if((*iter)->index == index)
+ {
+ visualHandle = (*iter)->visual;
+ break;
+ }
+ }
+ return visualHandle;
+}
+
/**
* Move visual from source to destination container
*/
-void MoveVisual( RegisteredVisualContainer::Iterator sourceIter, RegisteredVisualContainer& source, RegisteredVisualContainer& destination )
+void MoveVisual(RegisteredVisualContainer::Iterator sourceIter, RegisteredVisualContainer& source, RegisteredVisualContainer& destination)
{
- Toolkit::Visual::Base visual = (*sourceIter)->visual;
- if( visual )
- {
- RegisteredVisual* rv = source.Release( sourceIter );
- destination.PushBack( rv );
- }
+ Toolkit::Visual::Base visual = (*sourceIter)->visual;
+ if(visual)
+ {
+ RegisteredVisual* rv = source.Release(sourceIter);
+ destination.PushBack(rv);
+ }
}
/**
* @param[in] attributes The attributes with which to perfrom this action.
* @return true if action has been accepted by this control
*/
-const char* ACTION_ACCESSIBILITY_ACTIVATED = "accessibilityActivated";
-static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes )
+const char* ACTION_ACCESSIBILITY_ACTIVATED = "accessibilityActivated";
+const char* ACTION_ACCESSIBILITY_READING_CANCELLED = "ReadingCancelled";
+const char* ACTION_ACCESSIBILITY_READING_PAUSED = "ReadingPaused";
+const char* ACTION_ACCESSIBILITY_READING_RESUMED = "ReadingResumed";
+const char* ACTION_ACCESSIBILITY_READING_SKIPPED = "ReadingSkipped";
+const char* ACTION_ACCESSIBILITY_READING_STOPPED = "ReadingStopped";
+
+static bool DoAction(BaseObject* object, const std::string& actionName, const Property::Map& attributes)
{
- bool ret = false;
+ bool ret = true;
+
+ Dali::BaseHandle handle(object);
- if( object && ( 0 == strcmp( actionName.c_str(), ACTION_ACCESSIBILITY_ACTIVATED ) ) )
+ Toolkit::Control control = Toolkit::Control::DownCast(handle);
+
+ DALI_ASSERT_ALWAYS(control);
+
+ if(0 == strcmp(actionName.c_str(), ACTION_ACCESSIBILITY_ACTIVATED) || actionName == "activate")
{
- Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
- if( control )
+ // if cast succeeds there is an implementation so no need to check
+ if(!DevelControl::AccessibilityActivateSignal(control).Empty())
+ {
+ DevelControl::AccessibilityActivateSignal(control).Emit();
+ }
+ else
{
- // if cast succeeds there is an implementation so no need to check
- ret = Internal::GetImplementation( control ).OnAccessibilityActivated();
+ ret = Internal::GetImplementation(control).OnAccessibilityActivated();
}
}
-
+ else if(0 == strcmp(actionName.c_str(), ACTION_ACCESSIBILITY_READING_SKIPPED))
+ {
+ // if cast succeeds there is an implementation so no need to check
+ if(!DevelControl::AccessibilityReadingSkippedSignal(control).Empty())
+ {
+ DevelControl::AccessibilityReadingSkippedSignal(control).Emit();
+ }
+ }
+ else if(0 == strcmp(actionName.c_str(), ACTION_ACCESSIBILITY_READING_PAUSED))
+ {
+ // if cast succeeds there is an implementation so no need to check
+ if(!DevelControl::AccessibilityReadingPausedSignal(control).Empty())
+ {
+ DevelControl::AccessibilityReadingPausedSignal(control).Emit();
+ }
+ }
+ else if(0 == strcmp(actionName.c_str(), ACTION_ACCESSIBILITY_READING_RESUMED))
+ {
+ // if cast succeeds there is an implementation so no need to check
+ if(!DevelControl::AccessibilityReadingResumedSignal(control).Empty())
+ {
+ DevelControl::AccessibilityReadingResumedSignal(control).Emit();
+ }
+ }
+ else if(0 == strcmp(actionName.c_str(), ACTION_ACCESSIBILITY_READING_CANCELLED))
+ {
+ // if cast succeeds there is an implementation so no need to check
+ if(!DevelControl::AccessibilityReadingCancelledSignal(control).Empty())
+ {
+ DevelControl::AccessibilityReadingCancelledSignal(control).Emit();
+ }
+ }
+ else if(0 == strcmp(actionName.c_str(), ACTION_ACCESSIBILITY_READING_STOPPED))
+ {
+ // if cast succeeds there is an implementation so no need to check
+ if(!DevelControl::AccessibilityReadingStoppedSignal(control).Empty())
+ {
+ DevelControl::AccessibilityReadingStoppedSignal(control).Emit();
+ }
+ }
+ else
+ {
+ ret = false;
+ }
return ret;
}
* @return True if the signal was connected.
* @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
*/
-const char* SIGNAL_KEY_EVENT = "keyEvent";
+const char* SIGNAL_KEY_EVENT = "keyEvent";
const char* SIGNAL_KEY_INPUT_FOCUS_GAINED = "keyInputFocusGained";
-const char* SIGNAL_KEY_INPUT_FOCUS_LOST = "keyInputFocusLost";
-const char* SIGNAL_TAPPED = "tapped";
-const char* SIGNAL_PANNED = "panned";
-const char* SIGNAL_PINCHED = "pinched";
-const char* SIGNAL_LONG_PRESSED = "longPressed";
-static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+const char* SIGNAL_KEY_INPUT_FOCUS_LOST = "keyInputFocusLost";
+const char* SIGNAL_TAPPED = "tapped";
+const char* SIGNAL_PANNED = "panned";
+const char* SIGNAL_PINCHED = "pinched";
+const char* SIGNAL_LONG_PRESSED = "longPressed";
+const char* SIGNAL_GET_NAME = "getName";
+const char* SIGNAL_GET_DESCRIPTION = "getDescription";
+const char* SIGNAL_DO_GESTURE = "doGesture";
+static bool DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
{
- Dali::BaseHandle handle( object );
+ Dali::BaseHandle handle(object);
- bool connected( false );
- Toolkit::Control control = Toolkit::Control::DownCast( handle );
- if ( control )
+ bool connected(false);
+ Toolkit::Control control = Toolkit::Control::DownCast(handle);
+ if(control)
{
- Internal::Control& controlImpl( Internal::GetImplementation( control ) );
+ Internal::Control& controlImpl(Internal::GetImplementation(control));
connected = true;
- if ( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) )
+ if(0 == strcmp(signalName.c_str(), SIGNAL_KEY_EVENT))
+ {
+ controlImpl.KeyEventSignal().Connect(tracker, functor);
+ }
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_GAINED))
+ {
+ controlImpl.KeyInputFocusGainedSignal().Connect(tracker, functor);
+ }
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_LOST))
+ {
+ controlImpl.KeyInputFocusLostSignal().Connect(tracker, functor);
+ }
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_TAPPED))
{
- controlImpl.KeyEventSignal().Connect( tracker, functor );
+ controlImpl.EnableGestureDetection(GestureType::TAP);
+ controlImpl.GetTapGestureDetector().DetectedSignal().Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_GAINED ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_PANNED))
{
- controlImpl.KeyInputFocusGainedSignal().Connect( tracker, functor );
+ controlImpl.EnableGestureDetection(GestureType::PAN);
+ controlImpl.GetPanGestureDetector().DetectedSignal().Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_LOST ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_PINCHED))
{
- controlImpl.KeyInputFocusLostSignal().Connect( tracker, functor );
+ controlImpl.EnableGestureDetection(GestureType::PINCH);
+ controlImpl.GetPinchGestureDetector().DetectedSignal().Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_TAPPED ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_LONG_PRESSED))
{
- controlImpl.EnableGestureDetection( Gesture::Tap );
- controlImpl.GetTapGestureDetector().DetectedSignal().Connect( tracker, functor );
+ controlImpl.EnableGestureDetection(GestureType::LONG_PRESS);
+ controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_PANNED ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_GET_NAME))
{
- controlImpl.EnableGestureDetection( Gesture::Pan );
- controlImpl.GetPanGestureDetector().DetectedSignal().Connect( tracker, functor );
+ DevelControl::AccessibilityGetNameSignal(control).Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_PINCHED ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_GET_DESCRIPTION))
{
- controlImpl.EnableGestureDetection( Gesture::Pinch );
- controlImpl.GetPinchGestureDetector().DetectedSignal().Connect( tracker, functor );
+ DevelControl::AccessibilityGetDescriptionSignal(control).Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_LONG_PRESSED ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_DO_GESTURE))
{
- controlImpl.EnableGestureDetection( Gesture::LongPress );
- controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect( tracker, functor );
+ DevelControl::AccessibilityDoGestureSignal(control).Connect(tracker, functor);
}
}
return connected;
return Internal::Control::New();
}
// Setup signals and actions using the type-registry.
-DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create );
+DALI_TYPE_REGISTRATION_BEGIN(Control, CustomActor, Create);
// Note: Properties are registered separately below.
-SignalConnectorType registerSignal1( typeRegistration, SIGNAL_KEY_EVENT, &DoConnectSignal );
-SignalConnectorType registerSignal2( typeRegistration, SIGNAL_KEY_INPUT_FOCUS_GAINED, &DoConnectSignal );
-SignalConnectorType registerSignal3( typeRegistration, SIGNAL_KEY_INPUT_FOCUS_LOST, &DoConnectSignal );
-SignalConnectorType registerSignal4( typeRegistration, SIGNAL_TAPPED, &DoConnectSignal );
-SignalConnectorType registerSignal5( typeRegistration, SIGNAL_PANNED, &DoConnectSignal );
-SignalConnectorType registerSignal6( typeRegistration, SIGNAL_PINCHED, &DoConnectSignal );
-SignalConnectorType registerSignal7( typeRegistration, SIGNAL_LONG_PRESSED, &DoConnectSignal );
-
-TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &DoAction );
+SignalConnectorType registerSignal1(typeRegistration, SIGNAL_KEY_EVENT, &DoConnectSignal);
+SignalConnectorType registerSignal2(typeRegistration, SIGNAL_KEY_INPUT_FOCUS_GAINED, &DoConnectSignal);
+SignalConnectorType registerSignal3(typeRegistration, SIGNAL_KEY_INPUT_FOCUS_LOST, &DoConnectSignal);
+SignalConnectorType registerSignal4(typeRegistration, SIGNAL_TAPPED, &DoConnectSignal);
+SignalConnectorType registerSignal5(typeRegistration, SIGNAL_PANNED, &DoConnectSignal);
+SignalConnectorType registerSignal6(typeRegistration, SIGNAL_PINCHED, &DoConnectSignal);
+SignalConnectorType registerSignal7(typeRegistration, SIGNAL_LONG_PRESSED, &DoConnectSignal);
+SignalConnectorType registerSignal8(typeRegistration, SIGNAL_GET_NAME, &DoConnectSignal);
+SignalConnectorType registerSignal9(typeRegistration, SIGNAL_GET_DESCRIPTION, &DoConnectSignal);
+SignalConnectorType registerSignal10(typeRegistration, SIGNAL_DO_GESTURE, &DoConnectSignal);
+
+TypeAction registerAction1(typeRegistration, "activate", &DoAction);
+TypeAction registerAction2(typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &DoAction);
+TypeAction registerAction3(typeRegistration, ACTION_ACCESSIBILITY_READING_SKIPPED, &DoAction);
+TypeAction registerAction4(typeRegistration, ACTION_ACCESSIBILITY_READING_CANCELLED, &DoAction);
+TypeAction registerAction5(typeRegistration, ACTION_ACCESSIBILITY_READING_STOPPED, &DoAction);
+TypeAction registerAction6(typeRegistration, ACTION_ACCESSIBILITY_READING_PAUSED, &DoAction);
+TypeAction registerAction7(typeRegistration, ACTION_ACCESSIBILITY_READING_RESUMED, &DoAction);
DALI_TYPE_REGISTRATION_END()
* @param[in] container Container of visuals
* @param[in] parent Parent actor to remove visuals from
*/
-void SetVisualsOffScene( const RegisteredVisualContainer& container, Actor parent )
+void SetVisualsOffScene(const RegisteredVisualContainer& container, Actor parent)
{
- for( auto iter = container.Begin(), end = container.End() ; iter!= end; iter++)
+ for(auto iter = container.Begin(), end = container.End(); iter != end; iter++)
{
- if( (*iter)->visual )
+ if((*iter)->visual)
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::SetOffScene Setting visual(%d) off stage\n", (*iter)->index );
- Toolkit::GetImplementation((*iter)->visual).SetOffScene( parent );
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::SetOffScene Setting visual(%d) off stage\n", (*iter)->index);
+ Toolkit::GetImplementation((*iter)->visual).SetOffScene(parent);
}
}
}
-} // unnamed namespace
+Dali::Rect<> GetShowingGeometry(Dali::Rect<> rect, Dali::Toolkit::DevelControl::AccessibleImpl* accessibleImpl)
+{
+ Rect<> parentRect;
+ Vector2 currentPosition;
+ auto parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(accessibleImpl->GetParent());
+
+ while(parent)
+ {
+ parentRect = parent->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
+
+ currentPosition.x = rect.x;
+ currentPosition.y = rect.y;
+ rect.x = rect.x > parentRect.x ? rect.x : parentRect.x;
+ rect.y = rect.y > parentRect.y ? rect.y : parentRect.y;
+ rect.width = currentPosition.x + rect.width < parentRect.x + parentRect.width ? currentPosition.x + rect.width - rect.x : parentRect.x + parentRect.width - rect.x;
+ rect.height = currentPosition.y + rect.height < parentRect.y + parentRect.height ? currentPosition.y + rect.height - rect.y : parentRect.y + parentRect.height - rect.y;
+ if(rect.width < 0 || rect.height < 0)
+ {
+ return rect;
+ }
+
+ parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(parent->GetParent());
+ }
+
+ return rect;
+}
+
+static bool IsShowingGeometryOnScreen(Dali::Rect<> rect)
+{
+ return rect.width > 0 && rect.height > 0;
+}
+
+} // unnamed namespace
+
+// clang-format off
// Properties registered without macro to use specific member variables.
-const PropertyRegistration Control::Impl::PROPERTY_1( typeRegistration, "styleName", Toolkit::Control::Property::STYLE_NAME, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "keyInputFocus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_5( typeRegistration, "background", Toolkit::Control::Property::BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_6( typeRegistration, "margin", Toolkit::Control::Property::MARGIN, Property::EXTENTS, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_7( typeRegistration, "padding", Toolkit::Control::Property::PADDING, Property::EXTENTS, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_8( typeRegistration, "tooltip", Toolkit::DevelControl::Property::TOOLTIP, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_9( typeRegistration, "state", Toolkit::DevelControl::Property::STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_10( typeRegistration, "subState", Toolkit::DevelControl::Property::SUB_STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_11( typeRegistration, "leftFocusableActorId", Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_12( typeRegistration, "rightFocusableActorId", Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID,Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_13( typeRegistration, "upFocusableActorId", Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_14( typeRegistration, "downFocusableActorId", Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_15( typeRegistration, "shadow", Toolkit::DevelControl::Property::SHADOW, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-
-
-Control::Impl::Impl( Control& controlImpl )
-: mControlImpl( controlImpl ),
- mState( Toolkit::DevelControl::NORMAL ),
+const PropertyRegistration Control::Impl::PROPERTY_1(typeRegistration, "styleName", Toolkit::Control::Property::STYLE_NAME, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_4(typeRegistration, "keyInputFocus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_5(typeRegistration, "background", Toolkit::Control::Property::BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_6(typeRegistration, "margin", Toolkit::Control::Property::MARGIN, Property::EXTENTS, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_7(typeRegistration, "padding", Toolkit::Control::Property::PADDING, Property::EXTENTS, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_8(typeRegistration, "tooltip", Toolkit::DevelControl::Property::TOOLTIP, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_9(typeRegistration, "state", Toolkit::DevelControl::Property::STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_10(typeRegistration, "subState", Toolkit::DevelControl::Property::SUB_STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_11(typeRegistration, "leftFocusableActorId", Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_12(typeRegistration, "rightFocusableActorId", Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_13(typeRegistration, "upFocusableActorId", Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_14(typeRegistration, "downFocusableActorId", Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_15(typeRegistration, "shadow", Toolkit::DevelControl::Property::SHADOW, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_16(typeRegistration, "accessibilityName", Toolkit::DevelControl::Property::ACCESSIBILITY_NAME, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_17(typeRegistration, "accessibilityDescription", Toolkit::DevelControl::Property::ACCESSIBILITY_DESCRIPTION, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_18(typeRegistration, "accessibilityTranslationDomain", Toolkit::DevelControl::Property::ACCESSIBILITY_TRANSLATION_DOMAIN, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_19(typeRegistration, "accessibilityRole", Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_20(typeRegistration, "accessibilityHighlightable", Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_21(typeRegistration, "accessibilityAttributes", Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+// clang-format on
+
+Control::Impl::Impl(Control& controlImpl)
+: mControlImpl(controlImpl),
+ mState(Toolkit::DevelControl::NORMAL),
mSubStateName(""),
- mLeftFocusableActorId( -1 ),
- mRightFocusableActorId( -1 ),
- mUpFocusableActorId( -1 ),
- mDownFocusableActorId( -1 ),
+ mLeftFocusableActorId(-1),
+ mRightFocusableActorId(-1),
+ mUpFocusableActorId(-1),
+ mDownFocusableActorId(-1),
mStyleName(""),
mBackgroundColor(Color::TRANSPARENT),
- mStartingPinchScale( NULL ),
- mMargin( 0, 0, 0, 0 ),
- mPadding( 0, 0, 0, 0 ),
+ mStartingPinchScale(nullptr),
+ mMargin(0, 0, 0, 0),
+ mPadding(0, 0, 0, 0),
mKeyEventSignal(),
mKeyInputFocusGainedSignal(),
mKeyInputFocusLostSignal(),
mResourceReadySignal(),
mVisualEventSignal(),
+ mAccessibilityGetNameSignal(),
+ mAccessibilityGetDescriptionSignal(),
+ mAccessibilityDoGestureSignal(),
mPinchGestureDetector(),
mPanGestureDetector(),
mTapGestureDetector(),
mLongPressGestureDetector(),
- mTooltip( NULL ),
+ mTooltip(NULL),
mInputMethodContext(),
- mFlags( Control::ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
- mIsKeyboardNavigationSupported( false ),
- mIsKeyboardFocusGroup( false )
+ mIdleCallback(nullptr),
+ mFlags(Control::ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
+ mIsKeyboardNavigationSupported(false),
+ mIsKeyboardFocusGroup(false),
+ mIsEmittingResourceReadySignal(false),
+ mNeedToEmitResourceReady(false)
{
+ Dali::Accessibility::Accessible::RegisterControlAccessibilityGetter(
+ [](Dali::Actor actor) -> Dali::Accessibility::Accessible* {
+ return Control::Impl::GetAccessibilityObject(actor);
+ });
+
+ mAccessibilityConstructor = [](Dali::Actor actor) -> std::unique_ptr<Dali::Accessibility::Accessible> {
+ return std::unique_ptr<Dali::Accessibility::Accessible>(new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::UNKNOWN));
+ };
+
+ size_t length = static_cast<size_t>(Dali::Accessibility::RelationType::MAX_COUNT);
+ mAccessibilityRelations.reserve(length);
+ for(auto i = 0u; i < length; ++i)
+ {
+ mAccessibilityRelations.push_back({});
+ }
}
Control::Impl::~Impl()
{
+ for(auto&& iter : mVisuals)
+ {
+ StopObservingVisual(iter->visual);
+ }
+
+ for(auto&& iter : mRemoveVisuals)
+ {
+ StopObservingVisual(iter->visual);
+ }
+
// All gesture detectors will be destroyed so no need to disconnect.
delete mStartingPinchScale;
+
+ if(mIdleCallback && Adaptor::IsAvailable())
+ {
+ // Removes the callback from the callback manager in case the control is destroyed before the callback is executed.
+ Adaptor::Get().RemoveIdle(mIdleCallback);
+ }
}
-Control::Impl& Control::Impl::Get( Internal::Control& internalControl )
+Control::Impl& Control::Impl::Get(Internal::Control& internalControl)
{
return *internalControl.mImpl;
}
-const Control::Impl& Control::Impl::Get( const Internal::Control& internalControl )
+const Control::Impl& Control::Impl::Get(const Internal::Control& internalControl)
{
return *internalControl.mImpl;
}
+void Control::Impl::CheckHighlightedObjectGeometry()
+{
+ auto accessibleImpl = dynamic_cast<Dali::Toolkit::DevelControl::AccessibleImpl*>(mAccessibilityObject.get());
+ if(!accessibleImpl)
+ {
+ DALI_LOG_ERROR("accessibleImpl is not a pointer to a DevelControl::AccessibleImpl type");
+ return;
+ }
+
+ auto lastPosition = accessibleImpl->GetLastPosition();
+ auto accessibleRect = accessibleImpl->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
+ auto rect = GetShowingGeometry(accessibleRect, accessibleImpl);
+
+ switch(mAccessibilityLastScreenRelativeMoveType)
+ {
+ case Dali::Accessibility::ScreenRelativeMoveType::OUTSIDE:
+ {
+ if(IsShowingGeometryOnScreen(rect))
+ {
+ mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::INSIDE;
+ }
+ break;
+ }
+ case Dali::Accessibility::ScreenRelativeMoveType::INSIDE:
+ {
+ if(rect.width < 0 && accessibleRect.x != lastPosition.x)
+ {
+ mAccessibilityLastScreenRelativeMoveType = (accessibleRect.x < lastPosition.x) ? Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT : Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT;
+ }
+ if(rect.height < 0 && accessibleRect.y != lastPosition.y)
+ {
+ mAccessibilityLastScreenRelativeMoveType = (accessibleRect.y < lastPosition.y) ? Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT : Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT;
+ }
+ // notify AT-clients on outgoing moves only
+ if(mAccessibilityLastScreenRelativeMoveType != Dali::Accessibility::ScreenRelativeMoveType::INSIDE)
+ {
+ mAccessibilityObject.get()->EmitMovedOutOfScreen(mAccessibilityLastScreenRelativeMoveType);
+ }
+ break;
+ }
+ case Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT:
+ case Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT:
+ {
+ if(IsShowingGeometryOnScreen(rect))
+ {
+ mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::INSIDE;
+ }
+ else
+ {
+ mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::OUTSIDE;
+ }
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
+
+ accessibleImpl->SetLastPosition(Vector2(accessibleRect.x, accessibleRect.y));
+}
+
+void Control::Impl::RegisterAccessibilityPositionPropertyNotification()
+{
+ if(mIsAccessibilityPositionPropertyNotificationSet)
+ {
+ return;
+ }
+ // set default value until first move of object is detected
+ 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.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED);
+ mAccessibilityPositionNotification.NotifySignal().Connect(this, [this](PropertyNotification&){ CheckHighlightedObjectGeometry(); });
+ mIsAccessibilityPositionPropertyNotificationSet = true;
+}
+
+void Control::Impl::UnregisterAccessibilityPositionPropertyNotification()
+{
+ mControlImpl.Self().RemovePropertyNotification(mAccessibilityPositionNotification);
+ mIsAccessibilityPositionPropertyNotificationSet = false;
+}
+
// Gesture Detection Methods
void Control::Impl::PinchDetected(Actor actor, const PinchGesture& pinch)
{
mControlImpl.OnLongPress(longPress);
}
-void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual )
+void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual)
{
- RegisterVisual( index, visual, VisualState::ENABLED, DepthIndexValue::NOT_SET );
+ RegisterVisual(index, visual, VisualState::ENABLED, DepthIndexValue::NOT_SET);
}
-void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, int depthIndex )
+void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual, int depthIndex)
{
- RegisterVisual( index, visual, VisualState::ENABLED, DepthIndexValue::SET, depthIndex );
+ RegisterVisual(index, visual, VisualState::ENABLED, DepthIndexValue::SET, depthIndex);
}
-void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled )
+void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual, bool enabled)
{
- RegisterVisual( index, visual, ( enabled ? VisualState::ENABLED : VisualState::DISABLED ), DepthIndexValue::NOT_SET );
+ RegisterVisual(index, visual, (enabled ? VisualState::ENABLED : VisualState::DISABLED), DepthIndexValue::NOT_SET);
}
-void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex )
+void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex)
{
- RegisterVisual( index, visual, ( enabled ? VisualState::ENABLED : VisualState::DISABLED ), DepthIndexValue::SET, depthIndex );
+ RegisterVisual(index, visual, (enabled ? VisualState::ENABLED : VisualState::DISABLED), DepthIndexValue::SET, depthIndex);
}
-void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, VisualState::Type enabled, DepthIndexValue::Type depthIndexValueSet, int depthIndex )
+void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual, VisualState::Type enabled, DepthIndexValue::Type depthIndexValueSet, int depthIndex)
{
- DALI_LOG_INFO( gLogFilter, Debug::Concise, "RegisterVisual:%d \n", index );
+ DALI_LOG_INFO(gLogFilter, Debug::Concise, "RegisterVisual:%d \n", index);
- bool visualReplaced ( false );
+ bool visualReplaced(false);
Actor self = mControlImpl.Self();
// Set the depth index, if not set by caller this will be either the current visual depth, max depth of all visuals
// or zero.
int requiredDepthIndex = visual.GetDepthIndex();
- if( depthIndexValueSet == DepthIndexValue::SET )
+ if(depthIndexValueSet == DepthIndexValue::SET)
{
requiredDepthIndex = depthIndex;
}
// Visual replacement, existing visual should only be removed from stage when replacement ready.
- if( !mVisuals.Empty() )
+ if(!mVisuals.Empty())
{
RegisteredVisualContainer::Iterator registeredVisualsiter;
// Check if visual (index) is already registered, this is the current visual.
- if( FindVisual( index, mVisuals, registeredVisualsiter ) )
+ if(FindVisual(index, mVisuals, registeredVisualsiter))
{
Toolkit::Visual::Base& currentRegisteredVisual = (*registeredVisualsiter)->visual;
- if( currentRegisteredVisual )
+ if(currentRegisteredVisual)
{
// Store current visual depth index as may need to set the replacement visual to same depth
const int currentDepthIndex = (*registeredVisualsiter)->visual.GetDepthIndex();
// No longer required to know if the replaced visual's resources are ready
- StopObservingVisual( currentRegisteredVisual );
+ StopObservingVisual(currentRegisteredVisual);
// If control staged and visual enabled then visuals will be swapped once ready
- if( self.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) && enabled )
+ if(self.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE) && enabled)
{
// Check if visual is currently in the process of being replaced ( is in removal container )
RegisteredVisualContainer::Iterator visualQueuedForRemoval;
- if ( FindVisual( index, mRemoveVisuals, visualQueuedForRemoval ) )
+ if(FindVisual(index, mRemoveVisuals, visualQueuedForRemoval))
{
// Visual with same index is already in removal container so current visual pending
// Only the the last requested visual will be displayed so remove current visual which is staged but not ready.
- Toolkit::GetImplementation( currentRegisteredVisual ).SetOffScene( self );
- mVisuals.Erase( registeredVisualsiter );
+ Toolkit::GetImplementation(currentRegisteredVisual).SetOffScene(self);
+ mVisuals.Erase(registeredVisualsiter);
}
else
{
// current visual not already in removal container so add now.
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "RegisterVisual Move current registered visual to removal Queue: %d \n", index );
- MoveVisual( registeredVisualsiter, mVisuals, mRemoveVisuals );
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "RegisterVisual Move current registered visual to removal Queue: %d \n", index);
+ MoveVisual(registeredVisualsiter, mVisuals, mRemoveVisuals);
}
}
else
{
// Control not staged or visual disabled so can just erase from registered visuals and new visual will be added later.
- mVisuals.Erase( registeredVisualsiter );
+ mVisuals.Erase(registeredVisualsiter);
}
// If we've not set the depth-index value and the new visual does not have a depth index applied to it, then use the previously set depth-index for this index
- if( ( depthIndexValueSet == DepthIndexValue::NOT_SET ) &&
- ( visual.GetDepthIndex() == 0 ) )
+ if((depthIndexValueSet == DepthIndexValue::NOT_SET) &&
+ (visual.GetDepthIndex() == 0))
{
requiredDepthIndex = currentDepthIndex;
}
// If not set, set the name of the visual to the same name as the control's property.
// ( If the control has been type registered )
- if( visual.GetName().empty() )
+ if(visual.GetName().empty())
{
// returns empty string if index is not found as long as index is not -1
- std::string visualName = self.GetPropertyName( index );
- if( !visualName.empty() )
+ std::string visualName = self.GetPropertyName(index);
+ if(!visualName.empty())
{
- DALI_LOG_INFO( gLogFilter, Debug::Concise, "Setting visual name for property %d to %s\n",
- index, visualName.c_str() );
- visual.SetName( visualName );
+ DALI_LOG_INFO(gLogFilter, Debug::Concise, "Setting visual name for property %d to %s\n", index, visualName.c_str());
+ visual.SetName(visualName);
}
}
- if( !visualReplaced ) // New registration entry
+ if(!visualReplaced) // New registration entry
{
// If we've not set the depth-index value, we have more than one visual and the visual does not have a depth index, then set it to be the highest
- if( ( depthIndexValueSet == DepthIndexValue::NOT_SET ) &&
- ( mVisuals.Size() > 0 ) &&
- ( visual.GetDepthIndex() == 0 ) )
+ if((depthIndexValueSet == DepthIndexValue::NOT_SET) &&
+ (mVisuals.Size() > 0) &&
+ (visual.GetDepthIndex() == 0))
{
- int maxDepthIndex = std::numeric_limits< int >::min();
+ int maxDepthIndex = std::numeric_limits<int>::min();
- RegisteredVisualContainer::ConstIterator iter;
+ RegisteredVisualContainer::ConstIterator iter;
const RegisteredVisualContainer::ConstIterator endIter = mVisuals.End();
- for ( iter = mVisuals.Begin(); iter != endIter; iter++ )
+ for(iter = mVisuals.Begin(); iter != endIter; iter++)
{
const int visualDepthIndex = (*iter)->visual.GetDepthIndex();
- if ( visualDepthIndex > maxDepthIndex )
+ if(visualDepthIndex > maxDepthIndex)
{
maxDepthIndex = visualDepthIndex;
}
}
- ++maxDepthIndex; // Add one to the current maximum depth index so that our added visual appears on top
- requiredDepthIndex = std::max( 0, maxDepthIndex ); // Start at zero if maxDepth index belongs to a background
+ ++maxDepthIndex; // Add one to the current maximum depth index so that our added visual appears on top
+ requiredDepthIndex = std::max(0, maxDepthIndex); // Start at zero if maxDepth index belongs to a background
}
}
- if( visual )
+ if(visual)
{
// Set determined depth index
- visual.SetDepthIndex( requiredDepthIndex );
+ visual.SetDepthIndex(requiredDepthIndex);
// Monitor when the visual resources are ready
- StartObservingVisual( visual );
+ StartObservingVisual(visual);
- DALI_LOG_INFO( gLogFilter, Debug::Concise, "New Visual registration index[%d] depth[%d]\n", index, requiredDepthIndex );
- RegisteredVisual* newRegisteredVisual = new RegisteredVisual( index, visual,
- ( enabled == VisualState::ENABLED ? true : false ),
- ( visualReplaced && enabled ) ) ;
- mVisuals.PushBack( newRegisteredVisual );
+ DALI_LOG_INFO(gLogFilter, Debug::Concise, "New Visual registration index[%d] depth[%d]\n", index, requiredDepthIndex);
+ RegisteredVisual* newRegisteredVisual = new RegisteredVisual(index, visual, (enabled == VisualState::ENABLED ? true : false), (visualReplaced && enabled));
+ mVisuals.PushBack(newRegisteredVisual);
- Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual );
+ Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
// Put on stage if enabled and the control is already on the stage
- if( ( enabled == VisualState::ENABLED ) && self.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
+ if((enabled == VisualState::ENABLED) && self.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
{
- visualImpl.SetOnScene( self );
+ visualImpl.SetOnScene(self);
}
- else if( visualImpl.IsResourceReady() ) // When not being staged, check if visual already 'ResourceReady' before it was Registered. ( Resource may have been loaded already )
+ else if(visualImpl.IsResourceReady()) // When not being staged, check if visual already 'ResourceReady' before it was Registered. ( Resource may have been loaded already )
{
- ResourceReady( visualImpl );
+ ResourceReady(visualImpl);
}
-
}
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::RegisterVisual() Registered %s(%d), enabled:%s\n", visual.GetName().c_str(), index, enabled?"true":"false" );
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::RegisterVisual() Registered %s(%d), enabled:%s\n", visual.GetName().c_str(), index, enabled ? "true" : "false");
}
-void Control::Impl::UnregisterVisual( Property::Index index )
+void Control::Impl::UnregisterVisual(Property::Index index)
{
RegisteredVisualContainer::Iterator iter;
- if ( FindVisual( index, mVisuals, iter ) )
+ if(FindVisual(index, mVisuals, iter))
{
// stop observing visual
- StopObservingVisual( (*iter)->visual );
+ StopObservingVisual((*iter)->visual);
- Actor self( mControlImpl.Self() );
- Toolkit::GetImplementation((*iter)->visual).SetOffScene( self );
+ Actor self(mControlImpl.Self());
+ Toolkit::GetImplementation((*iter)->visual).SetOffScene(self);
(*iter)->visual.Reset();
- mVisuals.Erase( iter );
+ mVisuals.Erase(iter);
}
- if( FindVisual( index, mRemoveVisuals, iter ) )
+ if(FindVisual(index, mRemoveVisuals, iter))
{
- Actor self( mControlImpl.Self() );
- Toolkit::GetImplementation( (*iter)->visual ).SetOffScene( self );
+ Actor self(mControlImpl.Self());
+ Toolkit::GetImplementation((*iter)->visual).SetOffScene(self);
(*iter)->pending = false;
(*iter)->visual.Reset();
- mRemoveVisuals.Erase( iter );
+ mRemoveVisuals.Erase(iter);
}
}
-Toolkit::Visual::Base Control::Impl::GetVisual( Property::Index index ) const
+Toolkit::Visual::Base Control::Impl::GetVisual(Property::Index index) const
{
RegisteredVisualContainer::Iterator iter;
- if ( FindVisual( index, mVisuals, iter ) )
+ if(FindVisual(index, mVisuals, iter))
{
return (*iter)->visual;
}
return Toolkit::Visual::Base();
}
-void Control::Impl::EnableVisual( Property::Index index, bool enable )
+void Control::Impl::EnableVisual(Property::Index index, bool enable)
{
- DALI_LOG_INFO( gLogFilter, Debug::General, "Control::EnableVisual(%d, %s)\n", index, enable?"T":"F");
+ DALI_LOG_INFO(gLogFilter, Debug::General, "Control::EnableVisual(%d, %s)\n", index, enable ? "T" : "F");
RegisteredVisualContainer::Iterator iter;
- if ( FindVisual( index, mVisuals, iter ) )
+ if(FindVisual(index, mVisuals, iter))
{
- if ( (*iter)->enabled == enable )
+ if((*iter)->enabled == enable)
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual %s(%d) already %s\n", (*iter)->visual.GetName().c_str(), index, enable?"enabled":"disabled");
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::EnableVisual Visual %s(%d) already %s\n", (*iter)->visual.GetName().c_str(), index, enable ? "enabled" : "disabled");
return;
}
- (*iter)->enabled = enable;
+ (*iter)->enabled = enable;
Actor parentActor = mControlImpl.Self();
- if ( mControlImpl.Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) // If control not on Scene then Visual will be added when SceneConnection is called.
+ if(mControlImpl.Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE)) // If control not on Scene then Visual will be added when SceneConnection is called.
{
- if ( enable )
+ if(enable)
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) on stage \n", (*iter)->visual.GetName().c_str(), index );
- Toolkit::GetImplementation((*iter)->visual).SetOnScene( parentActor );
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) on stage \n", (*iter)->visual.GetName().c_str(), index);
+ Toolkit::GetImplementation((*iter)->visual).SetOnScene(parentActor);
}
else
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) off stage \n", (*iter)->visual.GetName().c_str(), index );
- Toolkit::GetImplementation((*iter)->visual).SetOffScene( parentActor ); // No need to call if control not staged.
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) off stage \n", (*iter)->visual.GetName().c_str(), index);
+ Toolkit::GetImplementation((*iter)->visual).SetOffScene(parentActor); // No need to call if control not staged.
}
}
}
else
{
- DALI_LOG_WARNING( "Control::EnableVisual(%d, %s) FAILED - NO SUCH VISUAL\n", index, enable?"T":"F" );
+ DALI_LOG_WARNING("Control::EnableVisual(%d, %s) FAILED - NO SUCH VISUAL\n", index, enable ? "T" : "F");
}
}
-bool Control::Impl::IsVisualEnabled( Property::Index index ) const
+bool Control::Impl::IsVisualEnabled(Property::Index index) const
{
RegisteredVisualContainer::Iterator iter;
- if ( FindVisual( index, mVisuals, iter ) )
+ if(FindVisual(index, mVisuals, iter))
{
return (*iter)->enabled;
}
return false;
}
-void Control::Impl::StopObservingVisual( Toolkit::Visual::Base& visual )
+void Control::Impl::StopObservingVisual(Toolkit::Visual::Base& visual)
{
- Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual );
+ Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
// Stop observing the visual
- visualImpl.RemoveEventObserver( *this );
+ visualImpl.RemoveEventObserver(*this);
}
-void Control::Impl::StartObservingVisual( Toolkit::Visual::Base& visual)
+void Control::Impl::StartObservingVisual(Toolkit::Visual::Base& visual)
{
- Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual );
+ Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
// start observing the visual for events
- visualImpl.AddEventObserver( *this );
+ visualImpl.AddEventObserver(*this);
}
// Called by a Visual when it's resource is ready
-void Control::Impl::ResourceReady( Visual::Base& object)
+void Control::Impl::ResourceReady(Visual::Base& object)
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::Impl::ResourceReady() replacements pending[%d]\n", mRemoveVisuals.Count() );
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::Impl::ResourceReady() replacements pending[%d]\n", mRemoveVisuals.Count());
Actor self = mControlImpl.Self();
// A resource is ready, find resource in the registered visuals container and get its index
- for( auto registeredIter = mVisuals.Begin(), end = mVisuals.End(); registeredIter != end; ++registeredIter )
+ for(auto registeredIter = mVisuals.Begin(), end = mVisuals.End(); registeredIter != end; ++registeredIter)
{
- Internal::Visual::Base& registeredVisualImpl = Toolkit::GetImplementation( (*registeredIter)->visual );
+ Internal::Visual::Base& registeredVisualImpl = Toolkit::GetImplementation((*registeredIter)->visual);
- if( &object == ®isteredVisualImpl )
+ if(&object == ®isteredVisualImpl)
{
RegisteredVisualContainer::Iterator visualToRemoveIter;
// Find visual with the same index in the removal container
// Set if off stage as it's replacement is now ready.
// Remove if from removal list as now removed from stage.
// Set Pending flag on the ready visual to false as now ready.
- if( FindVisual( (*registeredIter)->index, mRemoveVisuals, visualToRemoveIter ) )
+ if(FindVisual((*registeredIter)->index, mRemoveVisuals, visualToRemoveIter))
{
(*registeredIter)->pending = false;
- Toolkit::GetImplementation( (*visualToRemoveIter)->visual ).SetOffScene( self );
- mRemoveVisuals.Erase( visualToRemoveIter );
+ Toolkit::GetImplementation((*visualToRemoveIter)->visual).SetOffScene(self);
+ mRemoveVisuals.Erase(visualToRemoveIter);
}
break;
}
}
// A visual is ready so control may need relayouting if staged
- if ( self.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
+ if(self.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
{
mControlImpl.RelayoutRequest();
}
// Emit signal if all enabled visuals registered by the control are ready.
- if( IsResourceReady() )
+ if(IsResourceReady())
{
- Dali::Toolkit::Control handle( mControlImpl.GetOwner() );
- mResourceReadySignal.Emit( handle );
+ // Reset the flag
+ mNeedToEmitResourceReady = false;
+
+ EmitResourceReadySignal();
}
}
-void Control::Impl::NotifyVisualEvent( Visual::Base& object, Property::Index signalId )
+void Control::Impl::NotifyVisualEvent(Visual::Base& object, Property::Index signalId)
{
- for( auto registeredIter = mVisuals.Begin(), end = mVisuals.End(); registeredIter != end; ++registeredIter )
+ for(auto registeredIter = mVisuals.Begin(), end = mVisuals.End(); registeredIter != end; ++registeredIter)
{
- Internal::Visual::Base& registeredVisualImpl = Toolkit::GetImplementation( (*registeredIter)->visual );
- if( &object == ®isteredVisualImpl )
+ Internal::Visual::Base& registeredVisualImpl = Toolkit::GetImplementation((*registeredIter)->visual);
+ if(&object == ®isteredVisualImpl)
{
- Dali::Toolkit::Control handle( mControlImpl.GetOwner() );
- mVisualEventSignal.Emit( handle, (*registeredIter)->index, signalId );
+ Dali::Toolkit::Control handle(mControlImpl.GetOwner());
+ mVisualEventSignal.Emit(handle, (*registeredIter)->index, signalId);
break;
}
}
bool Control::Impl::IsResourceReady() const
{
// Iterate through and check all the enabled visuals are ready
- for( auto visualIter = mVisuals.Begin();
- visualIter != mVisuals.End(); ++visualIter )
+ for(auto visualIter = mVisuals.Begin();
+ visualIter != mVisuals.End();
+ ++visualIter)
{
- const Toolkit::Visual::Base visual = (*visualIter)->visual;
- const Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual );
+ const Toolkit::Visual::Base visual = (*visualIter)->visual;
+ const Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
// one of the enabled visuals is not ready
- if( !visualImpl.IsResourceReady() && (*visualIter)->enabled )
+ if(!visualImpl.IsResourceReady() && (*visualIter)->enabled)
{
return false;
}
return true;
}
-Toolkit::Visual::ResourceStatus Control::Impl::GetVisualResourceStatus( Property::Index index ) const
+Toolkit::Visual::ResourceStatus Control::Impl::GetVisualResourceStatus(Property::Index index) const
{
RegisteredVisualContainer::Iterator iter;
- if ( FindVisual( index, mVisuals, iter ) )
+ if(FindVisual(index, mVisuals, iter))
{
- const Toolkit::Visual::Base visual = (*iter)->visual;
- const Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual );
- return visualImpl.GetResourceStatus( );
+ const Toolkit::Visual::Base visual = (*iter)->visual;
+ const Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
+ return visualImpl.GetResourceStatus();
}
return Toolkit::Visual::ResourceStatus::PREPARING;
}
-
-
-void Control::Impl::AddTransitions( Dali::Animation& animation,
- const Toolkit::TransitionData& handle,
- bool createAnimation )
+void Control::Impl::AddTransitions(Dali::Animation& animation,
+ const Toolkit::TransitionData& handle,
+ bool createAnimation)
{
// Setup a Transition from TransitionData.
- const Internal::TransitionData& transitionData = Toolkit::GetImplementation( handle );
- TransitionData::Iterator end = transitionData.End();
- for( TransitionData::Iterator iter = transitionData.Begin() ;
- iter != end; ++iter )
+ const Internal::TransitionData& transitionData = Toolkit::GetImplementation(handle);
+ TransitionData::Iterator end = transitionData.End();
+ for(TransitionData::Iterator iter = transitionData.Begin();
+ iter != end;
+ ++iter)
{
TransitionData::Animator* animator = (*iter);
- Toolkit::Visual::Base visual = GetVisualByName( mVisuals, animator->objectName );
+ Toolkit::Visual::Base visual = GetVisualByName(mVisuals, animator->objectName);
- if( visual )
+ if(visual)
{
#if defined(DEBUG_ENABLED)
- Dali::TypeInfo typeInfo;
+ Dali::TypeInfo typeInfo;
ControlWrapper* controlWrapperImpl = dynamic_cast<ControlWrapper*>(&mControlImpl);
- if( controlWrapperImpl )
+ if(controlWrapperImpl)
{
typeInfo = controlWrapperImpl->GetTypeInfo();
}
- DALI_LOG_INFO( gLogFilter, Debug::Concise, "CreateTransition: Found %s visual for %s\n",
- visual.GetName().c_str(), typeInfo?typeInfo.GetName().c_str():"Unknown" );
+ DALI_LOG_INFO(gLogFilter, Debug::Concise, "CreateTransition: Found %s visual for %s\n", visual.GetName().c_str(), typeInfo ? typeInfo.GetName().c_str() : "Unknown");
#endif
- Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual );
- visualImpl.AnimateProperty( animation, *animator );
+ Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
+ visualImpl.AnimateProperty(animation, *animator);
}
else
{
- DALI_LOG_INFO( gLogFilter, Debug::Concise, "CreateTransition: Could not find visual. Trying actors");
+ DALI_LOG_INFO(gLogFilter, Debug::Concise, "CreateTransition: Could not find visual. Trying actors");
// Otherwise, try any actor children of control (Including the control)
- Actor child = mControlImpl.Self().FindChildByName( animator->objectName );
- if( child )
+ Actor child = mControlImpl.Self().FindChildByName(animator->objectName);
+ if(child)
{
- Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey );
- if( propertyIndex != Property::INVALID_INDEX )
+ Property::Index propertyIndex = child.GetPropertyIndex(animator->propertyKey);
+ if(propertyIndex != Property::INVALID_INDEX)
{
- if( animator->animate == false )
+ if(animator->animate == false)
{
- if( animator->targetValue.GetType() != Property::NONE )
+ if(animator->targetValue.GetType() != Property::NONE)
{
- child.SetProperty( propertyIndex, animator->targetValue );
+ child.SetProperty(propertyIndex, animator->targetValue);
}
}
else // animate the property
{
- if( animator->initialValue.GetType() != Property::NONE )
+ if(animator->initialValue.GetType() != Property::NONE)
{
- child.SetProperty( propertyIndex, animator->initialValue );
+ child.SetProperty(propertyIndex, animator->initialValue);
}
- if( createAnimation && !animation )
+ if(createAnimation && !animation)
{
- animation = Dali::Animation::New( 0.1f );
+ animation = Dali::Animation::New(0.1f);
}
- animation.AnimateTo( Property( child, propertyIndex ),
- animator->targetValue,
- animator->alphaFunction,
- TimePeriod( animator->timePeriodDelay,
- animator->timePeriodDuration ) );
+ animation.AnimateTo(Property(child, propertyIndex),
+ animator->targetValue,
+ animator->alphaFunction,
+ TimePeriod(animator->timePeriodDelay,
+ animator->timePeriodDuration));
}
}
}
}
}
-Dali::Animation Control::Impl::CreateTransition( const Toolkit::TransitionData& transitionData )
+Dali::Animation Control::Impl::CreateTransition(const Toolkit::TransitionData& transitionData)
{
Dali::Animation transition;
- if( transitionData.Count() > 0 )
+ if(transitionData.Count() > 0)
{
- AddTransitions( transition, transitionData, true );
+ AddTransitions(transition, transitionData, true);
}
return transition;
}
-
-
-void Control::Impl::DoAction( Dali::Property::Index visualIndex, Dali::Property::Index actionId, const Dali::Property::Value attributes )
+void Control::Impl::DoAction(Dali::Property::Index visualIndex, Dali::Property::Index actionId, const Dali::Property::Value attributes)
{
RegisteredVisualContainer::Iterator iter;
- if ( FindVisual( visualIndex, mVisuals, iter ) )
+ if(FindVisual(visualIndex, mVisuals, iter))
{
- Toolkit::GetImplementation((*iter)->visual).DoAction( actionId, attributes );
+ Toolkit::GetImplementation((*iter)->visual).DoAction(actionId, attributes);
}
}
-void Control::Impl::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
+void Control::Impl::AppendAccessibilityAttribute(const std::string& key, const std::string value)
{
- Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
+ Property::Value* checkedValue = mAccessibilityAttributes.Find(key);
+ if(checkedValue)
+ {
+ mAccessibilityAttributes[key] = Property::Value(value);
+ }
+ else
+ {
+ mAccessibilityAttributes.Insert(key, value);
+ }
+}
+
+void Control::Impl::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value)
+{
+ Toolkit::Control control = Toolkit::Control::DownCast(BaseHandle(object));
- if ( control )
+ if(control)
{
- Control& controlImpl( GetImplementation( control ) );
+ Control& controlImpl(GetImplementation(control));
- switch ( index )
+ switch(index)
{
case Toolkit::Control::Property::STYLE_NAME:
{
- controlImpl.SetStyleName( value.Get< std::string >() );
+ controlImpl.SetStyleName(value.Get<std::string>());
break;
}
case Toolkit::DevelControl::Property::STATE:
{
- bool withTransitions=true;
- const Property::Value* valuePtr=&value;
- Property::Map* map = value.GetMap();
+ bool withTransitions = true;
+ const Property::Value* valuePtr = &value;
+ const Property::Map* map = value.GetMap();
if(map)
{
Property::Value* value2 = map->Find("withTransitions");
- if( value2 )
+ if(value2)
{
withTransitions = value2->Get<bool>();
}
valuePtr = map->Find("state");
}
- if( valuePtr )
+ if(valuePtr)
{
- Toolkit::DevelControl::State state( controlImpl.mImpl->mState );
- if( Scripting::GetEnumerationProperty< Toolkit::DevelControl::State >( *valuePtr, ControlStateTable, ControlStateTableCount, state ) )
+ Toolkit::DevelControl::State state(controlImpl.mImpl->mState);
+ if(Scripting::GetEnumerationProperty<Toolkit::DevelControl::State>(*valuePtr, ControlStateTable, ControlStateTableCount, state))
{
- controlImpl.mImpl->SetState( state, withTransitions );
+ controlImpl.mImpl->SetState(state, withTransitions);
}
}
}
case Toolkit::DevelControl::Property::SUB_STATE:
{
std::string subState;
- if( value.Get( subState ) )
+ if(value.Get(subState))
{
- controlImpl.mImpl->SetSubState( subState );
+ controlImpl.mImpl->SetSubState(subState);
}
}
break;
case Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID:
{
int focusId;
- if( value.Get( focusId ) )
+ if(value.Get(focusId))
{
controlImpl.mImpl->mLeftFocusableActorId = focusId;
}
case Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID:
{
int focusId;
- if( value.Get( focusId ) )
+ if(value.Get(focusId))
{
controlImpl.mImpl->mRightFocusableActorId = focusId;
}
case Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID:
{
int focusId;
- if( value.Get( focusId ) )
+ if(value.Get(focusId))
{
controlImpl.mImpl->mUpFocusableActorId = focusId;
}
case Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID:
{
int focusId;
- if( value.Get( focusId ) )
+ if(value.Get(focusId))
{
controlImpl.mImpl->mDownFocusableActorId = focusId;
}
case Toolkit::Control::Property::KEY_INPUT_FOCUS:
{
- if ( value.Get< bool >() )
+ if(value.Get<bool>())
{
controlImpl.SetKeyInputFocus();
}
case Toolkit::Control::Property::BACKGROUND:
{
- std::string url;
- Vector4 color;
+ std::string url;
+ Vector4 color;
const Property::Map* map = value.GetMap();
- if( map && !map->Empty() )
+ if(map && !map->Empty())
{
- controlImpl.SetBackground( *map );
+ controlImpl.SetBackground(*map);
}
- else if( value.Get( url ) )
+ else if(value.Get(url))
{
// don't know the size to load
- Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( url, ImageDimensions() );
- if( visual )
+ Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual(url, ImageDimensions());
+ if(visual)
{
- controlImpl.mImpl->RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual, DepthIndex::BACKGROUND );
+ controlImpl.mImpl->RegisterVisual(Toolkit::Control::Property::BACKGROUND, visual, DepthIndex::BACKGROUND);
}
}
- else if( value.Get( color ) )
+ else if(value.Get(color))
{
controlImpl.SetBackgroundColor(color);
}
case Toolkit::Control::Property::MARGIN:
{
Extents margin;
- if( value.Get( margin ) )
+ if(value.Get(margin))
{
- controlImpl.mImpl->SetMargin( margin );
+ controlImpl.mImpl->SetMargin(margin);
}
break;
}
case Toolkit::Control::Property::PADDING:
{
Extents padding;
- if( value.Get( padding ) )
+ if(value.Get(padding))
{
- controlImpl.mImpl->SetPadding( padding );
+ controlImpl.mImpl->SetPadding(padding);
}
break;
}
case Toolkit::DevelControl::Property::TOOLTIP:
{
TooltipPtr& tooltipPtr = controlImpl.mImpl->mTooltip;
- if( ! tooltipPtr )
+ if(!tooltipPtr)
{
- tooltipPtr = Tooltip::New( control );
+ tooltipPtr = Tooltip::New(control);
}
- tooltipPtr->SetProperties( value );
+ tooltipPtr->SetProperties(value);
break;
}
case Toolkit::DevelControl::Property::SHADOW:
{
const Property::Map* map = value.GetMap();
- if( map && !map->Empty() )
+ if(map && !map->Empty())
{
- controlImpl.mImpl->SetShadow( *map );
+ controlImpl.mImpl->SetShadow(*map);
}
else
{
break;
}
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_NAME:
+ {
+ std::string name;
+ if(value.Get(name))
+ {
+ controlImpl.mImpl->mAccessibilityName = name;
+ controlImpl.mImpl->mAccessibilityNameSet = true;
+ }
+ else
+ {
+ controlImpl.mImpl->mAccessibilityNameSet = false;
+ }
+ }
+ break;
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_DESCRIPTION:
+ {
+ std::string text;
+ if(value.Get(text))
+ {
+ controlImpl.mImpl->mAccessibilityDescription = text;
+ controlImpl.mImpl->mAccessibilityDescriptionSet = true;
+ }
+ else
+ {
+ controlImpl.mImpl->mAccessibilityDescriptionSet = false;
+ }
+ }
+ break;
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_TRANSLATION_DOMAIN:
+ {
+ std::string text;
+ if(value.Get(text))
+ {
+ controlImpl.mImpl->mAccessibilityTranslationDomain = text;
+ controlImpl.mImpl->mAccessibilityTranslationDomainSet = true;
+ }
+ else
+ {
+ controlImpl.mImpl->mAccessibilityTranslationDomainSet = false;
+ }
+ }
+ break;
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE:
+ {
+ Dali::Accessibility::Role role;
+ if(value.Get(role))
+ {
+ controlImpl.mImpl->mAccessibilityRole = role;
+ }
+ }
+ break;
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE:
+ {
+ bool highlightable;
+ if(value.Get(highlightable))
+ {
+ controlImpl.mImpl->mAccessibilityHighlightable = highlightable;
+ controlImpl.mImpl->mAccessibilityHighlightableSet = true;
+ }
+ else
+ {
+ controlImpl.mImpl->mAccessibilityHighlightableSet = false;
+ }
+ }
+ break;
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES:
+ {
+ const Property::Map* map = value.GetMap();
+ if(map && !map->Empty())
+ {
+ controlImpl.mImpl->mAccessibilityAttributes = *map;
+ }
+ break;
+ }
}
}
}
-Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index index )
+Property::Value Control::Impl::GetProperty(BaseObject* object, Property::Index index)
{
Property::Value value;
- Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
+ Toolkit::Control control = Toolkit::Control::DownCast(BaseHandle(object));
- if ( control )
+ if(control)
{
- Control& controlImpl( GetImplementation( control ) );
+ Control& controlImpl(GetImplementation(control));
- switch ( index )
+ switch(index)
{
case Toolkit::Control::Property::STYLE_NAME:
{
case Toolkit::Control::Property::BACKGROUND:
{
- Property::Map map;
- Toolkit::Visual::Base visual = controlImpl.mImpl->GetVisual( Toolkit::Control::Property::BACKGROUND );
- if( visual )
+ Property::Map map;
+ Toolkit::Visual::Base visual = controlImpl.mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND);
+ if(visual)
{
- visual.CreatePropertyMap( map );
+ visual.CreatePropertyMap(map);
}
value = map;
case Toolkit::DevelControl::Property::TOOLTIP:
{
Property::Map map;
- if( controlImpl.mImpl->mTooltip )
+ if(controlImpl.mImpl->mTooltip)
{
- controlImpl.mImpl->mTooltip->CreatePropertyMap( map );
+ controlImpl.mImpl->mTooltip->CreatePropertyMap(map);
}
value = map;
break;
case Toolkit::DevelControl::Property::SHADOW:
{
- Property::Map map;
- Toolkit::Visual::Base visual = controlImpl.mImpl->GetVisual( Toolkit::DevelControl::Property::SHADOW );
- if( visual )
+ Property::Map map;
+ Toolkit::Visual::Base visual = controlImpl.mImpl->GetVisual(Toolkit::DevelControl::Property::SHADOW);
+ if(visual)
{
- visual.CreatePropertyMap( map );
+ visual.CreatePropertyMap(map);
}
value = map;
break;
}
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_NAME:
+ {
+ if(controlImpl.mImpl->mAccessibilityNameSet)
+ {
+ value = controlImpl.mImpl->mAccessibilityName;
+ }
+ break;
+ }
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_DESCRIPTION:
+ {
+ if(controlImpl.mImpl->mAccessibilityDescriptionSet)
+ {
+ value = controlImpl.mImpl->mAccessibilityDescription;
+ }
+ break;
+ }
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_TRANSLATION_DOMAIN:
+ {
+ if(controlImpl.mImpl->mAccessibilityTranslationDomainSet)
+ {
+ value = controlImpl.mImpl->mAccessibilityTranslationDomain;
+ }
+ break;
+ }
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE:
+ {
+ value = Property::Value(controlImpl.mImpl->mAccessibilityRole);
+ break;
+ }
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE:
+ {
+ if(controlImpl.mImpl->mAccessibilityHighlightableSet)
+ {
+ value = controlImpl.mImpl->mAccessibilityHighlightable;
+ }
+ break;
+ }
+
+ case Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES:
+ {
+ value = controlImpl.mImpl->mAccessibilityAttributes;
+ break;
+ }
}
}
return value;
}
+void Control::Impl::RemoveAccessibilityAttribute(const std::string& key)
+{
+ Property::Value* value = mAccessibilityAttributes.Find(key);
+ if(value)
+ {
+ mAccessibilityAttributes[key] = Property::Value();
+ }
+}
+
+void Control::Impl::ClearAccessibilityAttributes()
+{
+ mAccessibilityAttributes.Clear();
+}
-void Control::Impl::CopyInstancedProperties( RegisteredVisualContainer& visuals, Dictionary<Property::Map>& instancedProperties )
+void Control::Impl::SetAccessibilityReadingInfoType(const Dali::Accessibility::ReadingInfoTypes types)
{
- for(RegisteredVisualContainer::Iterator iter = visuals.Begin(); iter!= visuals.End(); iter++)
+ std::string value{};
+ if(types[Dali::Accessibility::ReadingInfoType::NAME])
{
- if( (*iter)->visual )
+ value += READING_INFO_TYPE_NAME;
+ }
+ if(types[Dali::Accessibility::ReadingInfoType::ROLE])
+ {
+ if(!value.empty())
+ {
+ value += READING_INFO_TYPE_SEPARATOR;
+ }
+ value += READING_INFO_TYPE_ROLE;
+ }
+ if(types[Dali::Accessibility::ReadingInfoType::DESCRIPTION])
+ {
+ if(!value.empty())
+ {
+ value += READING_INFO_TYPE_SEPARATOR;
+ }
+ value += READING_INFO_TYPE_DESCRIPTION;
+ }
+ if(types[Dali::Accessibility::ReadingInfoType::STATE])
+ {
+ if(!value.empty())
+ {
+ value += READING_INFO_TYPE_SEPARATOR;
+ }
+ value += READING_INFO_TYPE_STATE;
+ }
+ AppendAccessibilityAttribute(READING_INFO_TYPE_ATTRIBUTE_NAME, value);
+}
+
+Dali::Accessibility::ReadingInfoTypes Control::Impl::GetAccessibilityReadingInfoType() const
+{
+ std::string value{};
+ auto place = mAccessibilityAttributes.Find(READING_INFO_TYPE_ATTRIBUTE_NAME);
+ if(place)
+ {
+ 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())
+ {
+ return {};
+ }
+
+ Dali::Accessibility::ReadingInfoTypes types;
+
+ if(value.find(READING_INFO_TYPE_NAME) != std::string::npos)
+ {
+ types[Dali::Accessibility::ReadingInfoType::NAME] = true;
+ }
+ if(value.find(READING_INFO_TYPE_ROLE) != std::string::npos)
+ {
+ types[Dali::Accessibility::ReadingInfoType::ROLE] = true;
+ }
+ if(value.find(READING_INFO_TYPE_DESCRIPTION) != std::string::npos)
+ {
+ types[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = true;
+ }
+ if(value.find(READING_INFO_TYPE_STATE) != std::string::npos)
+ {
+ types[Dali::Accessibility::ReadingInfoType::STATE] = true;
+ }
+
+ return types;
+}
+
+void Control::Impl::CopyInstancedProperties(RegisteredVisualContainer& visuals, Dictionary<Property::Map>& instancedProperties)
+{
+ for(RegisteredVisualContainer::Iterator iter = visuals.Begin(); iter != visuals.End(); iter++)
+ {
+ if((*iter)->visual)
{
Property::Map instanceMap;
Toolkit::GetImplementation((*iter)->visual).CreateInstancePropertyMap(instanceMap);
- instancedProperties.Add( (*iter)->visual.GetName(), instanceMap );
+ instancedProperties.Add((*iter)->visual.GetName(), instanceMap);
}
}
}
-
-void Control::Impl::RemoveVisual( RegisteredVisualContainer& visuals, const std::string& visualName )
+void Control::Impl::RemoveVisual(RegisteredVisualContainer& visuals, const std::string& visualName)
{
- Actor self( mControlImpl.Self() );
+ Actor self(mControlImpl.Self());
- for ( RegisteredVisualContainer::Iterator visualIter = visuals.Begin();
- visualIter != visuals.End(); ++visualIter )
+ for(RegisteredVisualContainer::Iterator visualIter = visuals.Begin();
+ visualIter != visuals.End();
+ ++visualIter)
{
Toolkit::Visual::Base visual = (*visualIter)->visual;
- if( visual && visual.GetName() == visualName )
+ if(visual && visual.GetName() == visualName)
{
- Toolkit::GetImplementation(visual).SetOffScene( self );
+ Toolkit::GetImplementation(visual).SetOffScene(self);
(*visualIter)->visual.Reset();
- visuals.Erase( visualIter );
+ visuals.Erase(visualIter);
break;
}
}
}
-void Control::Impl::RemoveVisuals( RegisteredVisualContainer& visuals, DictionaryKeys& removeVisuals )
+void Control::Impl::RemoveVisuals(RegisteredVisualContainer& visuals, DictionaryKeys& removeVisuals)
{
- Actor self( mControlImpl.Self() );
- for( DictionaryKeys::iterator iter = removeVisuals.begin(); iter != removeVisuals.end(); ++iter )
+ Actor self(mControlImpl.Self());
+ for(DictionaryKeys::iterator iter = removeVisuals.begin(); iter != removeVisuals.end(); ++iter)
{
const std::string visualName = *iter;
- RemoveVisual( visuals, visualName );
+ RemoveVisual(visuals, visualName);
}
}
-void Control::Impl::RecreateChangedVisuals( Dictionary<Property::Map>& stateVisualsToChange,
- Dictionary<Property::Map>& instancedProperties )
+void Control::Impl::RecreateChangedVisuals(Dictionary<Property::Map>& stateVisualsToChange,
+ Dictionary<Property::Map>& instancedProperties)
{
- Dali::CustomActor handle( mControlImpl.GetOwner() );
- for( Dictionary<Property::Map>::iterator iter = stateVisualsToChange.Begin();
- iter != stateVisualsToChange.End(); ++iter )
+ Dali::CustomActor handle(mControlImpl.GetOwner());
+ for(Dictionary<Property::Map>::iterator iter = stateVisualsToChange.Begin();
+ iter != stateVisualsToChange.End();
+ ++iter)
{
- const std::string& visualName = (*iter).key;
- const Property::Map& toMap = (*iter).entry;
-
- // is it a candidate for re-creation?
- bool recreate = false;
+ const std::string& visualName = (*iter).key;
+ const Property::Map& toMap = (*iter).entry;
- Toolkit::Visual::Base visual = GetVisualByName( mVisuals, visualName );
- if( visual )
+ Actor self = mControlImpl.Self();
+ RegisteredVisualContainer::Iterator registeredVisualsiter;
+ // Check if visual (visualName) is already registered, this is the current visual.
+ if(FindVisual(visualName, mVisuals, registeredVisualsiter))
{
- Property::Map fromMap;
- visual.CreatePropertyMap( fromMap );
-
- Toolkit::Visual::Type fromType = GetVisualTypeFromMap( fromMap );
- Toolkit::Visual::Type toType = GetVisualTypeFromMap( toMap );
-
- if( fromType != toType )
- {
- recreate = true;
- }
- else
+ Toolkit::Visual::Base& visual = (*registeredVisualsiter)->visual;
+ if(visual)
{
- if( fromType == Toolkit::Visual::IMAGE || fromType == Toolkit::Visual::N_PATCH
- || fromType == Toolkit::Visual::SVG || fromType == Toolkit::Visual::ANIMATED_IMAGE )
- {
- Property::Value* fromUrl = fromMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
- Property::Value* toUrl = toMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+ // No longer required to know if the replaced visual's resources are ready
+ StopObservingVisual(visual);
- if( fromUrl && toUrl )
+ // If control staged then visuals will be swapped once ready
+ if(self.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
+ {
+ // Check if visual is currently in the process of being replaced ( is in removal container )
+ RegisteredVisualContainer::Iterator visualQueuedForRemoval;
+ if(FindVisual(visualName, mRemoveVisuals, visualQueuedForRemoval))
{
- std::string fromUrlString;
- std::string toUrlString;
- fromUrl->Get(fromUrlString);
- toUrl->Get(toUrlString);
-
- if( fromUrlString != toUrlString )
- {
- recreate = true;
- }
+ // Visual with same visual name is already in removal container so current visual pending
+ // Only the the last requested visual will be displayed so remove current visual which is staged but not ready.
+ Toolkit::GetImplementation(visual).SetOffScene(self);
+ (*registeredVisualsiter)->visual.Reset();
+ mVisuals.Erase(registeredVisualsiter);
}
+ else
+ {
+ // current visual not already in removal container so add now.
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "RegisterVisual Move current registered visual to removal Queue: %s \n", visualName.c_str());
+ MoveVisual(registeredVisualsiter, mVisuals, mRemoveVisuals);
+ }
+ }
+ else
+ {
+ // Control not staged or visual disabled so can just erase from registered visuals and new visual will be added later.
+ (*registeredVisualsiter)->visual.Reset();
+ mVisuals.Erase(registeredVisualsiter);
}
}
- const Property::Map* instancedMap = instancedProperties.FindConst( visualName );
- if( recreate || instancedMap )
- {
- RemoveVisual( mVisuals, visualName );
- Style::ApplyVisual( handle, visualName, toMap, instancedMap );
- }
- else
- {
- // @todo check to see if we can apply toMap without recreating the visual
- // e.g. by setting only animatable properties
- // For now, recreate all visuals, but merge in instance data.
- RemoveVisual( mVisuals, visualName );
- Style::ApplyVisual( handle, visualName, toMap, instancedMap );
- }
+ const Property::Map* instancedMap = instancedProperties.FindConst(visualName);
+ Style::ApplyVisual(handle, visualName, toMap, instancedMap);
}
}
}
-void Control::Impl::ReplaceStateVisualsAndProperties( const StylePtr oldState, const StylePtr newState, const std::string& subState )
+void Control::Impl::ReplaceStateVisualsAndProperties(const StylePtr oldState, const StylePtr newState, const std::string& subState)
{
// Collect all old visual names
DictionaryKeys stateVisualsToRemove;
- if( oldState )
+ if(oldState)
{
- oldState->visuals.GetKeys( stateVisualsToRemove );
- if( ! subState.empty() )
+ oldState->visuals.GetKeys(stateVisualsToRemove);
+ if(!subState.empty())
{
const StylePtr* oldSubState = oldState->subStates.FindConst(subState);
- if( oldSubState )
+ if(oldSubState)
{
DictionaryKeys subStateVisualsToRemove;
- (*oldSubState)->visuals.GetKeys( subStateVisualsToRemove );
- Merge( stateVisualsToRemove, subStateVisualsToRemove );
+ (*oldSubState)->visuals.GetKeys(subStateVisualsToRemove);
+ Merge(stateVisualsToRemove, subStateVisualsToRemove);
}
}
}
// Collect all new visual properties
Dictionary<Property::Map> stateVisualsToAdd;
- if( newState )
+ if(newState)
{
stateVisualsToAdd = newState->visuals;
- if( ! subState.empty() )
+ if(!subState.empty())
{
const StylePtr* newSubState = newState->subStates.FindConst(subState);
- if( newSubState )
+ if(newSubState)
{
- stateVisualsToAdd.Merge( (*newSubState)->visuals );
+ stateVisualsToAdd.Merge((*newSubState)->visuals);
}
}
}
// If a name is in both add/remove, move it to change list.
Dictionary<Property::Map> stateVisualsToChange;
- FindChangableVisuals( stateVisualsToAdd, stateVisualsToChange, stateVisualsToRemove);
+ FindChangableVisuals(stateVisualsToAdd, stateVisualsToChange, stateVisualsToRemove);
// Copy instanced properties (e.g. text label) of current visuals
Dictionary<Property::Map> instancedProperties;
- CopyInstancedProperties( mVisuals, instancedProperties );
+ CopyInstancedProperties(mVisuals, instancedProperties);
// For each visual in remove list, remove from mVisuals
- RemoveVisuals( mVisuals, stateVisualsToRemove );
+ RemoveVisuals(mVisuals, stateVisualsToRemove);
// For each visual in add list, create and add to mVisuals
- Dali::CustomActor handle( mControlImpl.GetOwner() );
- Style::ApplyVisuals( handle, stateVisualsToAdd, instancedProperties );
+ Dali::CustomActor handle(mControlImpl.GetOwner());
+ Style::ApplyVisuals(handle, stateVisualsToAdd, instancedProperties);
// For each visual in change list, if it requires a new visual,
// remove old visual, create and add to mVisuals
- RecreateChangedVisuals( stateVisualsToChange, instancedProperties );
+ RecreateChangedVisuals(stateVisualsToChange, instancedProperties);
}
-void Control::Impl::SetState( DevelControl::State newState, bool withTransitions )
+void Control::Impl::SetState(DevelControl::State newState, bool withTransitions)
{
DevelControl::State oldState = mState;
- Dali::CustomActor handle( mControlImpl.GetOwner() );
- DALI_LOG_INFO(gLogFilter, Debug::Concise, "Control::Impl::SetState: %s\n",
- (mState == DevelControl::NORMAL ? "NORMAL" :(
- mState == DevelControl::FOCUSED ?"FOCUSED" : (
- mState == DevelControl::DISABLED?"DISABLED":"NONE" ))));
+ Dali::CustomActor handle(mControlImpl.GetOwner());
+ DALI_LOG_INFO(gLogFilter, Debug::Concise, "Control::Impl::SetState: %s\n", (mState == DevelControl::NORMAL ? "NORMAL" : (mState == DevelControl::FOCUSED ? "FOCUSED" : (mState == DevelControl::DISABLED ? "DISABLED" : "NONE"))));
- if( mState != newState )
+ if(mState != newState)
{
// If mState was Disabled, and new state is Focused, should probably
// store that fact, e.g. in another property that FocusManager can access.
// Trigger state change and transitions
// Apply new style, if stylemanager is available
Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
- if( styleManager )
+ if(styleManager)
{
- const StylePtr stylePtr = GetImpl( styleManager ).GetRecordedStyle( Toolkit::Control( mControlImpl.GetOwner() ) );
+ const StylePtr stylePtr = GetImpl(styleManager).GetRecordedStyle(Toolkit::Control(mControlImpl.GetOwner()));
- if( stylePtr )
+ if(stylePtr)
{
- std::string oldStateName = Scripting::GetEnumerationName< Toolkit::DevelControl::State >( oldState, ControlStateTable, ControlStateTableCount );
- std::string newStateName = Scripting::GetEnumerationName< Toolkit::DevelControl::State >( newState, ControlStateTable, ControlStateTableCount );
+ std::string oldStateName = Scripting::GetEnumerationName<Toolkit::DevelControl::State>(oldState, ControlStateTable, ControlStateTableCount);
+ std::string newStateName = Scripting::GetEnumerationName<Toolkit::DevelControl::State>(newState, ControlStateTable, ControlStateTableCount);
- const StylePtr* newStateStyle = stylePtr->subStates.Find( newStateName );
- const StylePtr* oldStateStyle = stylePtr->subStates.Find( oldStateName );
- if( oldStateStyle && newStateStyle )
+ const StylePtr* newStateStyle = stylePtr->subStates.Find(newStateName);
+ const StylePtr* oldStateStyle = stylePtr->subStates.Find(oldStateName);
+ if(oldStateStyle && newStateStyle)
{
// Only change if both state styles exist
- ReplaceStateVisualsAndProperties( *oldStateStyle, *newStateStyle, mSubStateName );
+ ReplaceStateVisualsAndProperties(*oldStateStyle, *newStateStyle, mSubStateName);
}
}
}
}
}
-void Control::Impl::SetSubState( const std::string& subStateName, bool withTransitions )
+void Control::Impl::SetSubState(const std::string& subStateName, bool withTransitions)
{
- if( mSubStateName != subStateName )
+ if(mSubStateName != subStateName)
{
// Get existing sub-state visuals, and unregister them
- Dali::CustomActor handle( mControlImpl.GetOwner() );
+ Dali::CustomActor handle(mControlImpl.GetOwner());
Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
- if( styleManager )
+ if(styleManager)
{
- const StylePtr stylePtr = GetImpl( styleManager ).GetRecordedStyle( Toolkit::Control( mControlImpl.GetOwner() ) );
- if( stylePtr )
+ const StylePtr stylePtr = GetImpl(styleManager).GetRecordedStyle(Toolkit::Control(mControlImpl.GetOwner()));
+ if(stylePtr)
{
// Stringify state
- std::string stateName = Scripting::GetEnumerationName< Toolkit::DevelControl::State >( mState, ControlStateTable, ControlStateTableCount );
+ std::string stateName = Scripting::GetEnumerationName<Toolkit::DevelControl::State>(mState, ControlStateTable, ControlStateTableCount);
- const StylePtr* state = stylePtr->subStates.Find( stateName );
- if( state )
+ const StylePtr* state = stylePtr->subStates.Find(stateName);
+ if(state)
{
StylePtr stateStyle(*state);
- const StylePtr* newStateStyle = stateStyle->subStates.Find( subStateName );
- const StylePtr* oldStateStyle = stateStyle->subStates.Find( mSubStateName );
- if( oldStateStyle && newStateStyle )
+ const StylePtr* newStateStyle = stateStyle->subStates.Find(subStateName);
+ const StylePtr* oldStateStyle = stateStyle->subStates.Find(mSubStateName);
+ if(oldStateStyle && newStateStyle)
{
std::string empty;
- ReplaceStateVisualsAndProperties( *oldStateStyle, *newStateStyle, empty );
+ ReplaceStateVisualsAndProperties(*oldStateStyle, *newStateStyle, empty);
}
}
}
// then when this control appears back on stage it should use that new visual.
// Iterate through all registered visuals and set off scene
- SetVisualsOffScene( mVisuals, self );
+ SetVisualsOffScene(mVisuals, self);
// Visuals pending replacement can now be taken out of the removal list and set off scene
// Iterate through all replacement visuals and add to a move queue then set off scene
- for( auto removalIter = mRemoveVisuals.Begin(), end = mRemoveVisuals.End(); removalIter != end; removalIter++ )
+ for(auto removalIter = mRemoveVisuals.Begin(), end = mRemoveVisuals.End(); removalIter != end; removalIter++)
{
- Toolkit::GetImplementation((*removalIter)->visual).SetOffScene( self );
+ Toolkit::GetImplementation((*removalIter)->visual).SetOffScene(self);
}
- for( auto replacedIter = mVisuals.Begin(), end = mVisuals.End(); replacedIter != end; replacedIter++ )
+ for(auto replacedIter = mVisuals.Begin(), end = mVisuals.End(); replacedIter != end; replacedIter++)
{
(*replacedIter)->pending = false;
}
mRemoveVisuals.Clear();
}
-void Control::Impl::SetMargin( Extents margin )
+void Control::Impl::SetMargin(Extents margin)
{
mControlImpl.mImpl->mMargin = margin;
return mControlImpl.mImpl->mMargin;
}
-void Control::Impl::SetPadding( Extents padding )
+void Control::Impl::SetPadding(Extents padding)
{
mControlImpl.mImpl->mPadding = padding;
return mControlImpl.mImpl->mPadding;
}
-void Control::Impl::SetInputMethodContext( InputMethodContext& inputMethodContext )
+void Control::Impl::SetInputMethodContext(InputMethodContext& inputMethodContext)
{
mInputMethodContext = inputMethodContext;
}
-bool Control::Impl::FilterKeyEvent( const KeyEvent& event )
+bool Control::Impl::FilterKeyEvent(const KeyEvent& event)
{
- bool consumed ( false );
+ bool consumed(false);
- if ( mInputMethodContext )
+ if(mInputMethodContext)
{
- consumed = mInputMethodContext.FilterEventKey( event );
+ consumed = mInputMethodContext.FilterEventKey(event);
}
return consumed;
}
return mVisualEventSignal;
}
-void Control::Impl::SetShadow( const Property::Map& map )
+void Control::Impl::SetShadow(const Property::Map& map)
{
- Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map );
+ Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual(map);
visual.SetName("shadow");
- if( visual )
+ if(visual)
{
- mControlImpl.mImpl->RegisterVisual( Toolkit::DevelControl::Property::SHADOW, visual, DepthIndex::BACKGROUND_EFFECT );
+ mControlImpl.mImpl->RegisterVisual(Toolkit::DevelControl::Property::SHADOW, visual, DepthIndex::BACKGROUND_EFFECT);
mControlImpl.RelayoutRequest();
}
void Control::Impl::ClearShadow()
{
- mControlImpl.mImpl->UnregisterVisual( Toolkit::DevelControl::Property::SHADOW );
+ mControlImpl.mImpl->UnregisterVisual(Toolkit::DevelControl::Property::SHADOW);
- // Trigger a size negotiation request that may be needed when unregistering a visual.
- mControlImpl.RelayoutRequest();
+ // Trigger a size negotiation request that may be needed when unregistering a visual.
+ mControlImpl.RelayoutRequest();
+}
+
+Dali::Property Control::Impl::GetVisualProperty(Dali::Property::Index index, Dali::Property::Key visualPropertyKey)
+{
+ Toolkit::Visual::Base visual = GetVisualByIndex(mVisuals, index);
+ if(visual)
+ {
+ Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
+ return visualImpl.GetPropertyObject(visualPropertyKey);
+ }
+
+ Handle handle;
+ return Dali::Property(handle, Property::INVALID_INDEX);
+}
+
+void Control::Impl::MakeVisualTransition(Dali::Animation& animation, Dali::Toolkit::Control source, Dali::Property::Index visualIndex, AlphaFunction alphaFunction, TimePeriod timePeriod)
+{
+ Dali::Toolkit::Control sourceHandle = Dali::Toolkit::Control::DownCast(source);
+ Property::Map sourceMap = sourceHandle.GetProperty<Property::Map>(visualIndex);
+ Dali::Toolkit::Control destinationHandle = Dali::Toolkit::Control::DownCast(mControlImpl.Self());
+ Property::Map destinationMap = destinationHandle.GetProperty<Property::Map>(visualIndex);
+
+ Vector4 mixColor(1.0f, 1.0f, 1.0f, 1.0f);
+ Vector4 cornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
+ float borderlineWidth(0.0f);
+ Vector4 borderlineColor(0.0f, 0.0f, 0.0f, 1.0f);
+ float borderlineOffset(0.0f);
+
+ if(!destinationMap.Empty())
+ {
+ static auto findValueVector4 = [](const Property::Map& map, Property::Index index, const Vector4& defaultValue = Vector4()) -> Vector4 {
+ Property::Value* propertyValue = map.Find(index);
+ if(propertyValue)
+ {
+ return propertyValue->Get<Vector4>();
+ }
+ return defaultValue;
+ };
+
+ static auto findValueFloat = [](const Property::Map& map, Property::Index index, const float& defaultValue = 0.0f) -> float {
+ Property::Value* propertyValue = map.Find(index);
+ if(propertyValue)
+ {
+ return propertyValue->Get<float>();
+ }
+ return defaultValue;
+ };
+
+ mixColor = findValueVector4(destinationMap, Dali::Toolkit::Visual::Property::MIX_COLOR, mixColor);
+ cornerRadius = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, cornerRadius);
+ borderlineWidth = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth);
+ borderlineColor = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, borderlineColor);
+ borderlineOffset = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset);
+
+ if(sourceMap.Empty())
+ {
+ sourceMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
+ sourceMap.Insert(Dali::Toolkit::Visual::Property::MIX_COLOR, Color::TRANSPARENT);
+ sourceMap.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, cornerRadius);
+ sourceMap.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth);
+ sourceMap.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, borderlineColor);
+ sourceMap.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset);
+ }
+
+ Vector4 sourceMixColor = findValueVector4(sourceMap, Dali::Toolkit::Visual::Property::MIX_COLOR, mixColor);
+ Vector4 sourceCornerRadius = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, cornerRadius);
+ float sourceBorderlineWidth = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth);
+ Vector4 sourceBorderlineColor = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, borderlineColor);
+ float sourceBorderlineOffset = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset);
+
+ std::vector<Dali::Property> properties;
+ std::vector<std::pair<Property::Value, Property::Value>> values;
+
+ if(Vector3(sourceMixColor) != Vector3(mixColor))
+ {
+ properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::Visual::Property::MIX_COLOR));
+ values.push_back(std::make_pair(Vector3(sourceMixColor), Vector3(mixColor)));
+ }
+
+ if(std::abs(sourceMixColor.a - mixColor.a) > Math::MACHINE_EPSILON_1)
+ {
+ properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::Visual::Property::OPACITY));
+ values.push_back(std::make_pair(sourceMixColor.a, mixColor.a));
+ }
+
+ if(sourceCornerRadius != cornerRadius)
+ {
+ properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS));
+ values.push_back(std::make_pair(sourceCornerRadius, cornerRadius));
+ }
+
+ if(sourceBorderlineWidth != borderlineWidth)
+ {
+ properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH));
+ values.push_back(std::make_pair(sourceBorderlineWidth, borderlineWidth));
+ }
+
+ if(sourceBorderlineColor != borderlineColor)
+ {
+ properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR));
+ values.push_back(std::make_pair(sourceBorderlineColor, borderlineColor));
+ }
+
+ if(sourceBorderlineOffset != borderlineOffset)
+ {
+ properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET));
+ values.push_back(std::make_pair(sourceBorderlineOffset, borderlineOffset));
+ }
+
+ for(uint32_t i = 0; i < properties.size(); ++i)
+ {
+ if(timePeriod.delaySeconds > 0.0f)
+ {
+ Dali::KeyFrames initialKeyframes = Dali::KeyFrames::New();
+ initialKeyframes.Add(0.0f, values[i].first);
+ initialKeyframes.Add(1.0f, values[i].first);
+ animation.AnimateBetween(properties[i], initialKeyframes, TimePeriod(timePeriod.delaySeconds));
+ }
+ Dali::KeyFrames keyframes = Dali::KeyFrames::New();
+ keyframes.Add(0.0f, values[i].first);
+ keyframes.Add(1.0f, values[i].second);
+ animation.AnimateBetween(properties[i], keyframes, alphaFunction, timePeriod);
+ }
+ }
+}
+
+void Control::Impl::EmitResourceReadySignal()
+{
+ if(!mIsEmittingResourceReadySignal)
+ {
+ // Guard against calls to emit the signal during the callback
+ mIsEmittingResourceReadySignal = true;
+
+ // If the signal handler changes visual, it may become ready during this call & therefore this method will
+ // get called again recursively. If so, mNeedToEmitResourceReady is set below, and we act on it after that secondary
+ // invocation has completed by notifying in an Idle callback to prevent further recursion.
+ Dali::Toolkit::Control handle(mControlImpl.GetOwner());
+ mResourceReadySignal.Emit(handle);
+
+ if(mNeedToEmitResourceReady)
+ {
+ // Add idler to emit the signal again
+ if(!mIdleCallback)
+ {
+ // The callback manager takes the ownership of the callback object.
+ mIdleCallback = MakeCallback(this, &Control::Impl::OnIdleCallback);
+ Adaptor::Get().AddIdle(mIdleCallback, false);
+ }
+ }
+
+ mIsEmittingResourceReadySignal = false;
+ }
+ else
+ {
+ mNeedToEmitResourceReady = true;
+ }
+}
+
+void Control::Impl::OnIdleCallback()
+{
+ if(mNeedToEmitResourceReady)
+ {
+ // Reset the flag
+ mNeedToEmitResourceReady = false;
+
+ // A visual is ready so control may need relayouting if staged
+ if(mControlImpl.Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
+ {
+ mControlImpl.RelayoutRequest();
+ }
+
+ EmitResourceReadySignal();
+ }
+
+ // Set the pointer to null as the callback manager deletes the callback after execute it.
+ mIdleCallback = nullptr;
+}
+
+Dali::Accessibility::Accessible* Control::Impl::GetAccessibilityObject()
+{
+ if(!mAccessibilityObject)
+ {
+ mAccessibilityObject = mAccessibilityConstructor(mControlImpl.Self());
+ }
+ return mAccessibilityObject.get();
+}
+
+Dali::Accessibility::Accessible* Control::Impl::GetAccessibilityObject(Dali::Actor actor)
+{
+ if(actor)
+ {
+ auto control = Dali::Toolkit::Control::DownCast(actor);
+ if(control)
+ {
+ auto controlImpl = static_cast<Internal::Control*>(&control.GetImplementation());
+ return controlImpl->mImpl->GetAccessibilityObject();
+ }
+ }
+ return nullptr;
}
} // namespace Internal