X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscrollable-impl.h;h=4240a1e46c0c5cfacac359a2277ec06d519b5ac8;hb=4ea0e77009c95a4bb670a8ff44bd842b94f2271b;hp=9967fde5099f2b890eb34472933ce2d0b48424d4;hpb=1fe6286be11679b2f5c14a60636ae9cb486570e4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
index 9967fde..4240a1e 100644
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_SCROLLABLE_H
 
 /*
- * 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.
@@ -22,19 +22,17 @@
 #include <dali/public-api/animation/alpha-function.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
-#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 class Scrollable;
 typedef IntrusivePtr<Scrollable> ScrollablePtr;
 
@@ -44,7 +42,6 @@ typedef IntrusivePtr<Scrollable> ScrollablePtr;
 class Scrollable : public Control
 {
 public:
-
   /**
    * @copydoc Dali::Toolkit::Scrollable::IsOvershootEnabled
    */
@@ -84,13 +81,13 @@ public:
    * @param[in] position The position to scroll to.
    * @param[in] duration The duration of the animation in seconds
    */
-  virtual void ScrollTo(const Vector2 &position, float duration) = 0;
+  virtual void ScrollTo(const Vector2& position, float duration) = 0;
 
   /**
    * Set the color of the overshoot effect.
    * @parm[in] color The color of the overshoot effect
    */
-  virtual void SetOvershootEffectColor( const Vector4& color ) = 0;
+  virtual void SetOvershootEffectColor(const Vector4& color) = 0;
 
   /**
    * Retrieve the color of the overshoot effect.
@@ -101,7 +98,7 @@ public:
   /**
    * @copydoc Dali::Toolkit::Scrollable::SetOvershootAnimationSpeed(float pixelsPerSecond)
    */
-  void SetOvershootAnimationSpeed( float pixelsPerSecond );
+  void SetOvershootAnimationSpeed(float pixelsPerSecond);
 
   /**
    * @copydoc Dali::Toolkit::Scrollable::GetOvershootAnimationSpeed()
@@ -117,12 +114,12 @@ public:
    * Set the size of the overshoot effect.
    * @parm[in] size The size of the overshoot effect
    */
-  virtual void SetOvershootSize( const Vector2& size ) = 0;
+  virtual void SetOvershootSize(const Vector2& size) = 0;
 
 protected: // From Control
-  struct AccessibleImpl : public Control::Impl::AccessibleImpl
+  struct AccessibleImpl : public DevelControl::AccessibleImpl
   {
-    using Control::Impl::AccessibleImpl::AccessibleImpl;
+    using DevelControl::AccessibleImpl::AccessibleImpl;
 
     bool IsScrollable() override;
   };
@@ -133,16 +130,16 @@ protected: // From Control
   virtual void OnInitialize() override;
 
 private:
-
   /**
    * Temporary function to override EnableScrollOvershoot functionality for overshoot
    * Only ScrollView needs to override this as HQ has not requested disable functionality in ItemView
    * @param[in] enable true to enable, false to disable overshoot indicator
    */
-  virtual void EnableScrollOvershoot(bool enable) {}
+  virtual void EnableScrollOvershoot(bool enable)
+  {
+  }
 
 public: //Signals
-
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollStartedSignal()
    */
@@ -167,7 +164,7 @@ public: //Signals
    * @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.
    */
-  static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
+  static bool DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor);
 
   //properties
 
@@ -177,7 +174,7 @@ public: //Signals
    * @param[in] index The property index.
    * @param[in] value The new property value.
    */
-  static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value );
+  static void SetProperty(BaseObject* object, Property::Index index, const Property::Value& value);
 
   /**
    * Called to retrieve a property of an object of this type.
@@ -185,10 +182,9 @@ public: //Signals
    * @param[in] index The property index.
    * @return The current value of the property.
    */
-  static Property::Value GetProperty( BaseObject* object, Property::Index index );
+  static Property::Value GetProperty(BaseObject* object, Property::Index index);
 
 protected:
-
   /**
    * Removed default constructor.
    */
@@ -199,7 +195,7 @@ protected:
    *
    * @param[in] behaviourFlags Flags to enable
    */
-  Scrollable( ControlBehaviour behaviourFlags );
+  Scrollable(ControlBehaviour behaviourFlags);
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
@@ -207,7 +203,6 @@ protected:
   virtual ~Scrollable();
 
 private:
-
   /**
    * Gets position property.
    *
@@ -216,7 +211,6 @@ private:
   Vector2 GetPropertyPosition() const;
 
 private:
-
   // Undefined
   Scrollable(const Scrollable&);
 
@@ -224,20 +218,18 @@ private:
   Scrollable& operator=(const Scrollable& rhs);
 
 protected:
-
-  Vector4         mOvershootEffectColor;    ///<The color of the overshoot bouncing effect
-  float           mOvershootAnimationSpeed; ///<The speed of the overshoot animation (pixels per second)
-  Vector2         mOvershootSize;           ///<The size of the overshoot effect
+  Vector4 mOvershootEffectColor;    ///<The color of the overshoot bouncing effect
+  float   mOvershootAnimationSpeed; ///<The speed of the overshoot animation (pixels per second)
+  Vector2 mOvershootSize;           ///<The size of the overshoot effect
 
   Dali::AlphaFunction::BuiltinFunction mScrollToAlphaFunction; ///< The ScrollTo() animations use this
 
-  Toolkit::Scrollable::ScrollStartedSignalType mScrollStartedSignal;
-  Toolkit::Scrollable::ScrollUpdatedSignalType mScrollUpdatedSignal;
+  Toolkit::Scrollable::ScrollStartedSignalType   mScrollStartedSignal;
+  Toolkit::Scrollable::ScrollUpdatedSignalType   mScrollUpdatedSignal;
   Toolkit::Scrollable::ScrollCompletedSignalType mScrollCompletedSignal;
 
 private:
-
-  bool mOvershootEnabled:1;
+  bool mOvershootEnabled : 1;
 };
 
 } // namespace Internal