Merge "Fixed SVACE error in animated-image-visual.cpp" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / scrollable / item-view / spiral-layout.h

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h
index 00f550a..803aec4 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h
+++ b/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_SPIRAL_LAYOUT_H__
-#define __DALI_TOOLKIT_SPIRAL_LAYOUT_H__
+#ifndef DALI_TOOLKIT_SPIRAL_LAYOUT_H
+#define DALI_TOOLKIT_SPIRAL_LAYOUT_H
 
 /*
- * Copyright (c) 2015 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.
@@ -24,13 +24,10 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 class SpiralLayout;
 
 typedef IntrusivePtr<SpiralLayout> SpiralLayoutPtr;
@@ -41,7 +38,6 @@ typedef IntrusivePtr<SpiralLayout> SpiralLayoutPtr;
 class SpiralLayout : public ItemLayout
 {
 public:
-
   /**
    * Create a new spiral layout
    */
@@ -53,6 +49,12 @@ public:
   virtual ~SpiralLayout();
 
   /**
+   * Apply spiral layout Properties.
+   * @param[in] properties The properties of the layout.
+   */
+  void SetSpiralLayoutProperties(const Property::Map& properties);
+
+  /**
    * Set spacing angle between items.
    * @param[in] itemSpacing The angle in radians.
    */
@@ -114,79 +116,83 @@ public:
   /**
    * @copydoc ItemLayout::GetScrollSpeedFactor()
    */
-  virtual float GetScrollSpeedFactor() const;
+  float GetScrollSpeedFactor() const override;
 
   /**
    * @copydoc ItemLayout::GetMaximumSwipeSpeed()
    */
-  virtual float GetMaximumSwipeSpeed() const;
+  float GetMaximumSwipeSpeed() const override;
 
   /**
    * @copydoc ItemLayout::GetItemFlickAnimationDuration()
    */
-  virtual float GetItemFlickAnimationDuration() const;
+  float GetItemFlickAnimationDuration() const override;
 
   /**
    * @copydoc ItemLayout::GetClosestOnScreenLayoutPosition()
    */
-  virtual float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize);
+  float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) override;
 
 private:
-
   /**
    * @copydoc ItemLayout::GetMinimumLayoutPosition()
    */
-  virtual float GetMinimumLayoutPosition(unsigned int numberOfItems, Vector3 layoutSize) const;
+  float GetMinimumLayoutPosition(unsigned int numberOfItems, Vector3 layoutSize) const override;
 
   /**
    * @copydoc ItemLayout::GetClosestAnchorPosition()
    */
-  virtual float GetClosestAnchorPosition(float layoutPosition) const;
+  float GetClosestAnchorPosition(float layoutPosition) const override;
 
   /**
    * @copydoc ItemLayout::GetItemScrollToPosition()
    */
-  virtual float GetItemScrollToPosition(unsigned int itemId) const;
+  float GetItemScrollToPosition(unsigned int itemId) const override;
 
   /**
    * @copydoc ItemLayout::GetItemsWithinArea()
    */
-  virtual ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const;
+  ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const override;
 
   /**
    * @copydoc ItemLayout::GetReserveItemCount()
    */
-  virtual unsigned int GetReserveItemCount(Vector3 layoutSize) const;
+  unsigned int GetReserveItemCount(Vector3 layoutSize) const override;
 
   /**
    * @copydoc ItemLayout::GetDefaultItemSize()
    */
-  virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const;
+  void GetDefaultItemSize(unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize) const override;
 
   /**
    * @copydoc ItemLayout::GetScrollDirection()
    */
-  virtual Degree GetScrollDirection() const;
+  Degree GetScrollDirection() const override;
 
   /**
    * @copydoc ItemLayout::ApplyConstraints()
    */
-  virtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor );
+  void ApplyConstraints(Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor) override;
 
   /**
    * @copydoc ItemLayout::GetItemPosition()
    */
-  virtual Vector3 GetItemPosition( int itemID, float currentLayoutPosition, const Vector3& layoutSize ) const;
+  Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const override;
 
 protected:
-
   /**
    * Protected constructor; see also SpiralLayout::New()
    */
   SpiralLayout();
 
 private:
+  // Undefined
+  SpiralLayout(const SpiralLayout& spiralLayout);
 
+  // Undefined
+  SpiralLayout& operator=(const SpiralLayout& spiralLayout);
+
+private:
   struct Impl;
   Impl* mImpl;
 };
@@ -197,4 +203,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_SPIRAL_LAYOUT_H__
+#endif // DALI_TOOLKIT_SPIRAL_LAYOUT_H