summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2015-07-08 15:12:32 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2015-07-08 15:13:26 +0100
commit18502b842971c2d0ef38357f80c3b1a296a46c83 (patch)
tree0b46b812113215f0d47a5c40c94644ae60cb8603 /src/lib/evas/canvas
parent80eed1e285b285393432cf157f12d56763c19dcc (diff)
efl: fix doc references across the tree to validate right
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.eo12
-rw-r--r--src/lib/evas/canvas/evas_types.eot33
2 files changed, 30 insertions, 15 deletions
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.eo b/src/lib/evas/canvas/evas_canvas3d_material.eo
index 831d16e..a2f5808 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_material.eo
@@ -32,7 +32,7 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object, Evas.Common_Interface)
32 color_get @const { 32 color_get @const {
33 [[Get the material attribute color of the given material. 33 [[Get the material attribute color of the given material.
34 34
35 See also @evas_canvas3d_material_color_set. 35 See also @.color_set.
36 ]] 36 ]]
37 params { 37 params {
38 @in attrib: Evas.Canvas3D.Material_Attrib; [[Material attribute ID.]] 38 @in attrib: Evas.Canvas3D.Material_Attrib; [[Material attribute ID.]]
@@ -58,7 +58,7 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object, Evas.Common_Interface)
58 get { 58 get {
59 [[Get the material attribute enable flag of the given material. 59 [[Get the material attribute enable flag of the given material.
60 60
61 See also @evas_canvas3d_material_enable_set. 61 See also @.enable.set.
62 ]] 62 ]]
63 } 63 }
64 keys { 64 keys {
@@ -78,13 +78,13 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object, Evas.Common_Interface)
78 78
79 Default shininess value is 150.0. 79 Default shininess value is 150.0.
80 80
81 See also @evas_canvas3d_material_enable_set. 81 See also @.enable.set.
82 ]] 82 ]]
83 } 83 }
84 get { 84 get {
85 [[Get the shininess of the given material. 85 [[Get the shininess of the given material.
86 86
87 See also @evas_canvas3d_material_shininess_set. 87 See also @.shininess.set.
88 ]] 88 ]]
89 } 89 }
90 values { 90 values {
@@ -98,13 +98,13 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object, Evas.Common_Interface)
98 98
99 You have to enable the desired attribute first. 99 You have to enable the desired attribute first.
100 100
101 See also @evas_canvas3d_material_enable_set. 101 See also @.enable.set.
102 ]] 102 ]]
103 } 103 }
104 get { 104 get {
105 [[Get the texture of the given material. 105 [[Get the texture of the given material.
106 106
107 See also @evas_canvas3d_material_texture_set. 107 See also @.texture.set.
108 ]] 108 ]]
109 } 109 }
110 110
diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot
index 3128bd0..0e7596d 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_types.eot
@@ -9,7 +9,7 @@ enum Evas.Aspect_Control {
9 using the given aspect]] 9 using the given aspect]]
10 vertical = 3, [[Use all vertical container space to place an object, using 10 vertical = 3, [[Use all vertical container space to place an object, using
11 the given aspect]] 11 the given aspect]]
12 both = 4 [[Use all horizontal @b and vertical container spaces to place an 12 both = 4 [[Use all horizontal and vertical container spaces to place an
13 object (never growing it out of those bounds), using the given 13 object (never growing it out of those bounds), using the given
14 aspect]] 14 aspect]]
15} 15}
@@ -117,7 +117,8 @@ enum Evas.Font.Hinting_Flags {
117 117
118struct Evas.Map; [[An opaque handle to map points 118struct Evas.Map; [[An opaque handle to map points
119 119
120 See @evas_map_new, @evas_map_free, @evas_map_dup. 120 See \@ref evas_map_new, \@ref evas_map_free,
121 \@ref evas_map_dup.
121 ]] 122 ]]
122 123
123enum Evas.Button_Flags { 124enum Evas.Button_Flags {
@@ -198,19 +199,33 @@ enum Evas.Callback_Type
198 199
199 image_unloaded, [[Image data has been unloaded (by some mechanism in Evas that throw out original image data)]] 200 image_unloaded, [[Image data has been unloaded (by some mechanism in Evas that throw out original image data)]]
200 201
201 render_pre, [[Called just before rendering starts on the canvas target @since 1.2]] 202 render_pre, [[Called just before rendering starts on the canvas target
202 render_post, [[Called just after rendering stops on the canvas target @since 1.2]]
203 203
204 image_resize, [[Image size is changed @since 1.8]] 204 @since 1.2]]
205 device_changed, [[Devices added, removed or changed on canvas @since 1.8]] 205 render_post, [[Called just after rendering stops on the canvas target
206 206
207 axis_update, [[Input device changed value on some axis @since 1.13]] 207 @since 1.2]]
208 208
209 canvas_viewport_resize, [[Canvas viewport resized @since 1.15]] 209 image_resize, [[Image size is changed
210
211 @since 1.8]]
212 device_changed, [[Devices added, removed or changed on canvas
213
214 @since 1.8]]
215
216 axis_update, [[Input device changed value on some axis
217
218 @since 1.13]]
219
220 canvas_viewport_resize, [[Canvas viewport resized
221
222 @since 1.15]]
210 last [[kept as last element/sentinel -- not really an event]] 223 last [[kept as last element/sentinel -- not really an event]]
211} 224}
212 225
213struct Evas.Modifier; [[An opaque type containing information on which modifier keys are registered in an Evas canvas]] 226struct Evas.Modifier; [[An opaque type containing information on which modifier keys are registered in an Evas canvas]]
214struct Evas.Lock; [[An opaque type containing information on which lock keys are registered in an Evas canvas]] 227struct Evas.Lock; [[An opaque type containing information on which lock keys are registered in an Evas canvas]]
215struct Evas.Engine_Info; [[A generic Evas Engine information structure]] 228struct Evas.Engine_Info; [[A generic Evas Engine information structure]]
216struct Evas.Axis; [[Details for a single device axis state @since 1.13]] 229struct Evas.Axis; [[Details for a single device axis state
230
231 @since 1.13]]