From ec296646f6967a4860d2d54901a77ca046edba6d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 7 Jun 2012 18:02:25 +0100 Subject: [PATCH] table: Deprecate the align, expand, and fill layout properties ClutterActor exposes their equivalent, and ClutterTableLayout honours them since commit 8e24de86b6f88f3bfd1e65cdfd845f330212d1c6. --- clutter/clutter-table-layout.c | 21 +++++++++++++++++++-- clutter/clutter-table-layout.h | 7 +++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c index a49c842fb..ac76dc433 100644 --- a/clutter/clutter-table-layout.c +++ b/clutter/clutter-table-layout.c @@ -1084,8 +1084,7 @@ calculate_row_heights (ClutterTableLayout *self, if (!rows[i].expand) { - rows[i].expand = clutter_actor_needs_expand (child, - orientation) || + rows[i].expand = clutter_actor_needs_expand (child, orientation) || meta->y_expand; } } @@ -1948,6 +1947,9 @@ clutter_table_layout_get_span (ClutterTableLayout *layout, * inside @layout * * Since: 1.4 + * + * Deprecated: 1.12: Use clutter_actor_set_x_align() and + * clutter_actor_set_y_align() instead. */ void clutter_table_layout_set_alignment (ClutterTableLayout *layout, @@ -2003,6 +2005,9 @@ clutter_table_layout_set_alignment (ClutterTableLayout *layout, * clutter_table_layout_set_alignment(). * * Since: 1.4 + * + * Deprecated: 1.12: Use clutter_actor_get_x_align() and + * clutter_actor_get_y_align() instead. */ void clutter_table_layout_get_alignment (ClutterTableLayout *layout, @@ -2061,6 +2066,9 @@ clutter_table_layout_get_alignment (ClutterTableLayout *layout, * inside @layout * * Since: 1.4 + * + * Deprecated: 1.12: Use clutter_actor_set_x_align() and + * clutter_actor_set_y_align() instead. */ void clutter_table_layout_set_fill (ClutterTableLayout *layout, @@ -2115,6 +2123,9 @@ clutter_table_layout_set_fill (ClutterTableLayout *layout, * as set using clutter_table_layout_pack() or clutter_table_layout_set_fill() * * Since: 1.4 + * + * Deprecated: 1.12: Use clutter_actor_get_x_align() and + * clutter_actor_get_y_align() instead. */ void clutter_table_layout_get_fill (ClutterTableLayout *layout, @@ -2174,6 +2185,9 @@ clutter_table_layout_get_fill (ClutterTableLayout *layout, * inside @layout * * Since: 1.4 + * + * Deprecated: 1.12: Use clutter_actor_set_x_expand() or + * clutter_actor_set_y_expand() instead. */ void clutter_table_layout_set_expand (ClutterTableLayout *layout, @@ -2228,6 +2242,9 @@ clutter_table_layout_set_expand (ClutterTableLayout *layout, * as set using clutter_table_layout_pack() or clutter_table_layout_set_expand() * * Since: 1.4 + * + * Deprecated: 1.12: Use clutter_actor_get_x_expand() and + * clutter_actor_get_y_expand() instead. */ void clutter_table_layout_get_expand (ClutterTableLayout *layout, diff --git a/clutter/clutter-table-layout.h b/clutter/clutter-table-layout.h index ce3679a35..06d6e5105 100644 --- a/clutter/clutter-table-layout.h +++ b/clutter/clutter-table-layout.h @@ -101,26 +101,33 @@ void clutter_table_layout_get_span (ClutterTableLayo ClutterActor *actor, gint *column_span, gint *row_span); + +CLUTTER_DEPRECATED_IN_1_12 void clutter_table_layout_set_alignment (ClutterTableLayout *layout, ClutterActor *actor, ClutterTableAlignment x_align, ClutterTableAlignment y_align); +CLUTTER_DEPRECATED_IN_1_12 void clutter_table_layout_get_alignment (ClutterTableLayout *layout, ClutterActor *actor, ClutterTableAlignment *x_align, ClutterTableAlignment *y_align); +CLUTTER_DEPRECATED_IN_1_12 void clutter_table_layout_set_fill (ClutterTableLayout *layout, ClutterActor *actor, gboolean x_fill, gboolean y_fill); +CLUTTER_DEPRECATED_IN_1_12 void clutter_table_layout_get_fill (ClutterTableLayout *layout, ClutterActor *actor, gboolean *x_fill, gboolean *y_fill); +CLUTTER_DEPRECATED_IN_1_12 void clutter_table_layout_set_expand (ClutterTableLayout *layout, ClutterActor *actor, gboolean x_expand, gboolean y_expand); +CLUTTER_DEPRECATED_IN_1_12 void clutter_table_layout_get_expand (ClutterTableLayout *layout, ClutterActor *actor, gboolean *x_expand,