[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / scrollable / scroll-view / scroll-view-page-path-effect.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
old mode 100755 (executable)
new mode 100644 (file)
index e18eff4..b4c7ee3
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H__
-#define __DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H__
+#ifndef DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H
+#define DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -26,13 +26,11 @@
 
 namespace Dali
 {
-
 class Actor;
 class Path;
 
 namespace Toolkit
 {
-
 namespace Internal DALI_INTERNAL
 {
 class ScrollViewPagePathEffect;
@@ -67,20 +65,18 @@ class ScrollViewPagePathEffect;
  */
 class DALI_TOOLKIT_API ScrollViewPagePathEffect : public ScrollViewEffect
 {
-
 public:
-
   /**
    * @brief Creates an initialized ScrollViewPagePathEffect.
    * @SINCE_1_0.0
    * @param[in] path The path that will be used by the scroll effect
    * @param[in] forward Vector in page object space which will be aligned with the tangent of the path
    * @param[in] inputPropertyIndex Index of a property of the scroll-view which will be used as the input for the path
-   * @param[in] pageSize Size of a page in the scrollview
+   * @param[in] viewPageSize Size of a page in the scrollview
    * @param[in] pageCount Total number of pages in the scrollview
    * @return A handle to a newly allocated Dali resource
    */
-  static ScrollViewPagePathEffect New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount);
+  static ScrollViewPagePathEffect New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount);
 
   /**
    * @brief Creates an uninitialized ScrollViewPagePathEffect; this can be initialized with ScrollViewPagePathEffect::New().
@@ -98,7 +94,7 @@ public:
    * @param[in] handle Handle to an object
    * @return Handle to a ScrollViewPagePathEffect or an uninitialized handle
    */
-  static ScrollViewPagePathEffect DownCast( BaseHandle handle );
+  static ScrollViewPagePathEffect DownCast(BaseHandle handle);
 
   /**
    * @brief Manually apply effect to a page in the scroll-view.
@@ -106,19 +102,17 @@ public:
    * @param[in] page The page to be affected by this effect
    * @param[in] pageOrder The order of the page in the scroll view
    */
-  void ApplyToPage( Actor page, unsigned int pageOrder );
+  void ApplyToPage(Actor page, unsigned int pageOrder);
 
 protected:
-
   /// @cond internal
   /**
    * @brief This constructor is used by Dali New() methods.
    * @SINCE_1_0.0
    * @param[in] impl A pointer to a newly allocated Dali resource
    */
-  explicit DALI_INTERNAL ScrollViewPagePathEffect( Internal::ScrollViewPagePathEffect *impl );
+  explicit DALI_INTERNAL ScrollViewPagePathEffect(Internal::ScrollViewPagePathEffect* impl);
   /// @endcond
-
 };
 
 /**
@@ -128,4 +122,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H__
+#endif // DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H