-#ifndef __DALI_INTERNAL_GESTURE_DETECTOR_H__
-#define __DALI_INTERNAL_GESTURE_DETECTOR_H__
+#ifndef DALI_INTERNAL_GESTURE_DETECTOR_H
+#define DALI_INTERNAL_GESTURE_DETECTOR_H
/*
- * Copyright (c) 2014 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.
*/
// INTERNAL INCLUDES
-#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/internal/event/actors/actor-impl.h>
#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/events/gesture-detector.h>
#include <dali/public-api/events/gesture.h>
#include <dali/public-api/signals/slot-delegate.h>
-#include <dali/public-api/events/gesture-detector.h>
-#include <dali/internal/event/actors/actor-impl.h>
namespace Dali
{
-
namespace Integration
{
struct GestureEvent;
namespace Internal
{
-
class GestureDetector;
class GestureEventProcessor;
-typedef IntrusivePtr<GestureDetector> GestureDetectorPtr;
-typedef std::vector<GestureDetector*> GestureDetectorContainer;
-typedef std::vector<Actor*> GestureDetectorActorContainer;
+using GestureDetectorPtr = IntrusivePtr<GestureDetector>;
+using GestureDetectorContainer = std::vector<GestureDetector*>;
+using GestureDetectorActorContainer = std::vector<Actor*>;
/**
* This is a type trait that should be used by deriving gesture detectors for their container type.
*/
-template< typename Detector >
+template<typename Detector>
struct DerivedGestureDetectorContainer
{
- typedef std::vector<Detector*> type;
+ using type = std::vector<Detector*>;
};
/**
* @copydoc Dali::GestureDetector
*/
-class GestureDetector : public ProxyObject, public ProxyObject::Observer
+class GestureDetector : public Object, public Object::Observer
{
public:
-
/**
* @copydoc Dali::GestureDetector::Attach()
*/
void DetachAll();
/**
- * @copydoc Dali::GestureDetector::GetAttachedActors() const
+ * @copydoc Dali::GestureDetector::GetAttachedActorCount() const
+ */
+ size_t GetAttachedActorCount() const;
+
+ /**
+ * @copydoc Dali::GestureDetector::GetAttachedActor() const
*/
- std::vector<Dali::Actor> GetAttachedActors() const;
+ Dali::Actor GetAttachedActor(size_t index) const;
/**
* Returns a const reference to the container of attached actor pointers.
* Retrieves the type of GestureDetector
* @return The GestureDetector Type
*/
- Gesture::Type GetType() const
+ GestureType::Value GetType() const
{
return mType;
}
/**
- * Checks if the specified actor is still attached.
+ * Checks if the specified actor is still attached or pending attachment.
* @param[in] actor The actor to check.
- * @return true, if the actor is attached, false otherwise.
+ * @return true, if the actor is attached or pending, false otherwise.
*/
bool IsAttached(Actor& actor) const;
protected: // Creation & Destruction
-
/**
* Construct a new GestureDetector.
+ * @param type the type of gesture
+ * @param pointer to the scene object, nullptr if none
+ * by default GestureDetectors don't have our own scene object
*/
- GestureDetector(Gesture::Type mType);
+ GestureDetector(GestureType::Value type, const SceneGraph::PropertyOwner* sceneObject = nullptr);
/**
* A reference counted object may only be deleted by calling Unreference()
*/
- virtual ~GestureDetector();
+ ~GestureDetector() override;
private:
-
- // Undefined
- GestureDetector(const GestureDetector&);
-
// Undefined
- GestureDetector& operator=(const GestureDetector& rhs);
+ GestureDetector() = delete;
+ GestureDetector(const GestureDetector&) = delete;
+ GestureDetector& operator=(const GestureDetector& rhs) = delete;
/**
- * @copydoc Dali::Internal::ProxyObject::Observer::SceneObjectAdded()
+ * @copydoc Dali::Internal::Object::Observer::SceneObjectAdded()
*/
- virtual void SceneObjectAdded(ProxyObject& proxy) {}
+ void SceneObjectAdded(Object& object) override;
/**
- * @copydoc Dali::Internal::ProxyObject::Observer::SceneObjectAdded()
+ * @copydoc Dali::Internal::Object::Observer::SceneObjectAdded()
*/
- virtual void SceneObjectRemoved(ProxyObject& proxy) {}
+ void SceneObjectRemoved(Object& object) override
+ {
+ }
/**
- * @copydoc Dali::Internal::ProxyObject::Observer::ProxyDestroyed()
+ * @copydoc Dali::Internal::Object::Observer::ObjectDestroyed()
*/
- virtual void ProxyDestroyed(ProxyObject& proxy);
+ void ObjectDestroyed(Object& object) override;
/**
* For use in derived classes, called after an actor is attached.
*/
virtual void OnActorDestroyed(Object& object) = 0;
-private: // Default property extensions from ProxyObject
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
- */
- virtual unsigned int GetDefaultPropertyCount() const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyIndices()
- */
- virtual void GetDefaultPropertyIndices( Property::IndexContainer& indices ) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyName()
- */
- virtual const char* GetDefaultPropertyName(Property::Index index) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyIndex()
- */
- virtual Property::Index GetDefaultPropertyIndex(const std::string& name) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::IsDefaultPropertyWritable()
- */
- virtual bool IsDefaultPropertyWritable(Property::Index index) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::IsDefaultPropertyAnimatable()
- */
- virtual bool IsDefaultPropertyAnimatable(Property::Index index) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::IsDefaultPropertyAConstraintInput()
- */
- virtual bool IsDefaultPropertyAConstraintInput( Property::Index index ) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyType()
- */
- virtual Property::Type GetDefaultPropertyType(Property::Index index) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::SetDefaultProperty()
- */
- virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetDefaultProperty()
- */
- virtual Property::Value GetDefaultProperty( Property::Index index ) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetSceneObject()
- */
- virtual const SceneGraph::PropertyOwner* GetSceneObject() const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetSceneObjectAnimatableProperty()
- */
- virtual const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const;
-
- /**
- * @copydoc Dali::Internal::ProxyObject::GetSceneObjectInputProperty()
- */
- virtual const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const;
-
protected:
-
- Gesture::Type mType; ///< The gesture detector will detect this type of gesture.
- GestureDetectorActorContainer mAttachedActors; ///< Proxy<Node>::Observer is used to provide weak-pointer behaviour
+ GestureType::Value mType; ///< The gesture detector will detect this type of gesture.
+ GestureDetectorActorContainer mAttachedActors; ///< Object::Observer is used to provide weak-pointer behaviour
+ GestureDetectorActorContainer mPendingAttachActors; ///< Object::Observer is used to provide weak-pointer behaviour
GestureEventProcessor& mGestureEventProcessor; ///< A reference to the gesture event processor.
};
inline Internal::GestureDetector& GetImplementation(Dali::GestureDetector& detector)
{
- DALI_ASSERT_ALWAYS( detector && "GestureDetector handle is empty" );
+ DALI_ASSERT_ALWAYS(detector && "GestureDetector handle is empty");
BaseObject& handle = detector.GetBaseObject();
inline const Internal::GestureDetector& GetImplementation(const Dali::GestureDetector& detector)
{
- DALI_ASSERT_ALWAYS( detector && "GestureDetector handle is empty" );
+ DALI_ASSERT_ALWAYS(detector && "GestureDetector handle is empty");
const BaseObject& handle = detector.GetBaseObject();
} // namespace Dali
-#endif // __DALI_INTERNAL_GESTURE_DETECTOR_H__
+#endif // DALI_INTERNAL_GESTURE_DETECTOR_H