diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c index 80100feda..59e564e9e 100644 --- a/clutter/clutter-bin-layout.c +++ b/clutter/clutter-bin-layout.c @@ -39,6 +39,16 @@ * alignment policies.</simpara></listitem> * </itemizedlist> * + * <figure id="bin-layout"> + * <title>Bin layout</title> + * <para>The image shows a #ClutterBinLayout with three layers: + * a background #ClutterCairoTexture, set to fill on both the X + * and Y axis; a #ClutterTexture, set to center on both the X and + * Y axis; and a #ClutterRectangle, set to %CLUTTER_BIN_ALIGNMENT_END + * on both the X and Y axis.</para> + * <graphic fileref="bin-layout.png" format="PNG"/> + * </figure> + * * <example id="example-clutter-bin-layout"> * <title>How to pack actors inside a BinLayout</title> * <para>The following code shows how to build a composite actor with diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c index c9371f950..5076dc4e2 100644 --- a/clutter/clutter-box-layout.c +++ b/clutter/clutter-box-layout.c @@ -49,6 +49,13 @@ * layout properties.</para></listitem> * </itemizedlist> * + * <figure id="box-layout"> + * <title>Box layout</title> + * <para>The image shows a #ClutterBoxLayout with the + * #ClutterBoxLayout:vertical property set to %FALSE.</para> + * <graphic fileref="box-layout.png" format="PNG"/> + * </figure> + * * It is possible to control the spacing between children of a * #ClutterBoxLayout by using clutter_box_layout_set_spacing(). * diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c index bc81a679d..c2bd72de6 100644 --- a/clutter/clutter-flow-layout.c +++ b/clutter/clutter-flow-layout.c @@ -48,6 +48,22 @@ * in both columns and rows.</para></listitem> * </itemizedlist> * + * <figure id="flow-layout-horizontal"> + * <title>Horizontal flow layout</title> + * <para>The image shows a #ClutterFlowLayout with the + * #ClutterFlowLayout:orientation propert set to + * %CLUTTER_FLOW_HORIZONTAL.</para> + * <graphic fileref="flow-layout-horizontal.png" format="PNG"/> + * </figure> + * + * <figure id="flow-layout-vertical"> + * <title>Vertical flow layout</title> + * <para>The image shows a #ClutterFlowLayout with the + * #ClutterFlowLayout:orientation propert set to + * %CLUTTER_FLOW_VERTICAL.</para> + * <graphic fileref="flow-layout-vertical.png" format="PNG"/> + * </figure> + * * #ClutterFlowLayout is available since Clutter 1.2 */ diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am index 4ee491a4f..53549c2c6 100644 --- a/doc/reference/clutter/Makefile.am +++ b/doc/reference/clutter/Makefile.am @@ -105,8 +105,12 @@ EXTRA_HFILES=\ # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png HTML_IMAGES=\ actor-box.png \ + bin-layout.png \ + box-layout.png \ easing-modes.png \ event-flow.png \ + flow-layout-horizontal.png \ + flow-layout-vertical.png \ path-alpha-func.png # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). @@ -152,7 +156,11 @@ include $(top_srcdir)/gtk-doc.make # e.g. EXTRA_DIST += version.xml.in EXTRA_DIST += \ actor-box.png \ + bin-layout.png \ + box-layout.png \ easing-modes.png \ easing-modes.svg \ event-flow.png \ + flow-layout-horizontal.png \ + flow-layout-vertical.png \ path-alpha-func.png diff --git a/doc/reference/clutter/bin-layout.png b/doc/reference/clutter/bin-layout.png new file mode 100644 index 000000000..87e9b9948 Binary files /dev/null and b/doc/reference/clutter/bin-layout.png differ diff --git a/doc/reference/clutter/box-layout.png b/doc/reference/clutter/box-layout.png new file mode 100644 index 000000000..729d2386a Binary files /dev/null and b/doc/reference/clutter/box-layout.png differ diff --git a/doc/reference/clutter/flow-layout-horizontal.png b/doc/reference/clutter/flow-layout-horizontal.png new file mode 100644 index 000000000..30df8c9cb Binary files /dev/null and b/doc/reference/clutter/flow-layout-horizontal.png differ diff --git a/doc/reference/clutter/flow-layout-vertical.png b/doc/reference/clutter/flow-layout-vertical.png new file mode 100644 index 000000000..76c3df86d Binary files /dev/null and b/doc/reference/clutter/flow-layout-vertical.png differ