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 "Do not reposition the text's popup when buttons are pressed." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scroll-view
/
scroll-view.h
diff --git
a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
index
fb9d5cb
..
7ebb168
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
+++ b/
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
@@
-34,6
+34,10
@@
namespace Internal DALI_INTERNAL
{
class ScrollView;
}
{
class ScrollView;
}
+/**
+ * @addtogroup dali_toolkit_controls_scroll_view
+ * @{
+ */
/**
* @brief How axes/rotation or scale are clamped
/**
* @brief How axes/rotation or scale are clamped
@@
-1136,6
+1140,9
@@
public: // Not intended for application developers
explicit DALI_INTERNAL ScrollView( Dali::Internal::CustomActor* internal );
};
explicit DALI_INTERNAL ScrollView( Dali::Internal::CustomActor* internal );
};
+/**
+ * @}
+ */
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali