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 "Fix for multi-language support." into tizen
[platform/core/uifw/dali-toolkit.git]
/
docs
/
content
/
main-page.h
diff --git
a/docs/content/main-page.h
b/docs/content/main-page.h
index
1d2b483
..
f74e830
100644
(file)
--- a/
docs/content/main-page.h
+++ b/
docs/content/main-page.h
@@
-14,7
+14,7
@@
* - \link hello-world Hello World - explained \endlink
*
* \section Actors Actors
* - \link hello-world Hello World - explained \endlink
*
* \section Actors Actors
- * - \link image-
text-mesh-actor Image, Text
and Mesh actors \endlink
+ * - \link image-
mesh-actor Image
and Mesh actors \endlink
* - \link event-system Event Handling \endlink
* - \link custom-actor Custom Actor \endlink
*
* - \link event-system Event Handling \endlink
* - \link custom-actor Custom Actor \endlink
*
@@
-28,15
+28,16
@@
* - \link animation-multi-threading-notes Multi-threading Notes \endlink
*
* \section Constraints
* - \link animation-multi-threading-notes Multi-threading Notes \endlink
*
* \section Constraints
- * - \link constraints-intro Introduction to Constraints \endlink
+ * - \link constraints Constraints \endlink
+ *
+ * \section SizeNegotiation Size Negotiation
+ * - \link size-negotiation Size Negotiation \endlink
*
* \section UIControls UI Controls
*
* \section UIControls UI Controls
+ * - \link text-label Text Label \endlink
* - \link item-view Item View \endlink
* - \link item-view Item View \endlink
- * - \link text-view Text View \endlink
- * - \link text-input Text Input \endlink
* - \link scroll-view Scroll View \endlink
* - \link scroll-view Scroll View \endlink
- * - \link markup-processor Markup Processor \endlink
- * - \link size-negotiation Size Negotiation \endlink
+ * - \link size-negotiation-controls Size Negotiation for Controls \endlink
* - \link type-registration Type Registration \endlink
* - \link properties Properties \endlink
* - \link background Background \endlink
* - \link type-registration Type Registration \endlink
* - \link properties Properties \endlink
* - \link background Background \endlink
@@
-50,12
+51,8
@@
*
* \section Scripting
* - \link script-overview Overview \endlink
*
* \section Scripting
* - \link script-overview Overview \endlink
- * - \link script-howto How to Add a Custom Control \endlink
* - \link script-hello Hello World in script \endlink
* - \link script-hello Hello World in script \endlink
- *
* - \link handle-body-idiom Handle – body idiom \endlink
* - \link handle-body-idiom Handle – body idiom \endlink
- * - \link boost-library Boost Library \endlink
- * - \link boost-function Boost function usage \endlink
*
* \section Rendering
* - \link viewing-modes Viewing modes \endlink
*
* \section Rendering
* - \link viewing-modes Viewing modes \endlink
@@
-99,7
+96,7
@@
* When the button is pressed, the actor will receive an event and adjust the color of its button face
* element.
*
* When the button is pressed, the actor will receive an event and adjust the color of its button face
* element.
*
- * \section scene_
dali
Why does Dali internally have a second scene graph?
+ * \section scene_
internal
Why does Dali internally have a second scene graph?
* Actors and elements are contained in a scene graph which deals with input, layout and some animation
* it doesn't perform any drawing.
*
* Actors and elements are contained in a scene graph which deals with input, layout and some animation
* it doesn't perform any drawing.
*