projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add Visual descriptions to generate doxygen page" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scroll-view
/
scroll-view-effect.h
diff --git
a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
index
73b97b0
..
049e2ab
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
+++ b/
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
@@
-50,9
+50,10
@@
class ScrollViewEffect;
* ScrollView instance.
*
* Such effects are purely logical (i.e. physics), and may produce
* ScrollView instance.
*
* Such effects are purely logical (i.e. physics), and may produce
- * properties that can be used with visual effects
. S
uch as creating
+ * properties that can be used with visual effects
, s
uch as creating
* constraints that are applied to ShaderEffects or Actors using these
* properties as inputs.
* constraints that are applied to ShaderEffects or Actors using these
* properties as inputs.
+ * @SINCE_1_0.0
*/
class DALI_IMPORT_API ScrollViewEffect : public Dali::BaseHandle
{
*/
class DALI_IMPORT_API ScrollViewEffect : public Dali::BaseHandle
{
@@
-60,20
+61,24
@@
class DALI_IMPORT_API ScrollViewEffect : public Dali::BaseHandle
public:
/**
public:
/**
- * @brief Create an uninitialized ScrollViewEffect; this can only be initialized with derived classes.
+ * @brief Create
s
an uninitialized ScrollViewEffect; this can only be initialized with derived classes.
*
* Calling member functions with an uninitialized Toolkit::BaseObject is not allowed.
*
* Calling member functions with an uninitialized Toolkit::BaseObject is not allowed.
+ * @SINCE_1_0.0
*/
ScrollViewEffect();
public: // Not intended for application developers
*/
ScrollViewEffect();
public: // Not intended for application developers
+ /// @cond internal
/**
* @brief This constructor is used by Dali New() methods.
*
/**
* @brief This constructor is used by Dali New() methods.
*
- * @param [in] impl A pointer to a newly allocated Dali resource
+ * @SINCE_1_0.0
+ * @param[in] impl A pointer to a newly allocated Dali resource
*/
explicit DALI_INTERNAL ScrollViewEffect(Internal::ScrollViewEffect *impl);
*/
explicit DALI_INTERNAL ScrollViewEffect(Internal::ScrollViewEffect *impl);
+ /// @endcond
};
};