[Xfce4-commits] [apps/xfdashboard] 01/02: Avoid determining size of parent in XfdashboardScaledTableLayout recursively and infinitely when getting preferred width and/or height

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit e03e64154bf692148761c849c1d12ef97d9924b5
Author: Stephan Haller <nomad at froevel.de>
Date:   Thu Jun 4 13:42:40 2015 +0200

    Avoid determining size of parent in XfdashboardScaledTableLayout recursively and infinitely when getting preferred width and/or height
---
 xfdashboard/scaled-table-layout.c |   34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/xfdashboard/scaled-table-layout.c b/xfdashboard/scaled-table-layout.c
index c43e240..24f7952 100644
--- a/xfdashboard/scaled-table-layout.c
+++ b/xfdashboard/scaled-table-layout.c
@@ -56,6 +56,9 @@ struct _XfdashboardScaledTableLayoutPrivate
 	gint		rows;
 	gint		columns;
 	gint		numberChildren;
+
+	gboolean	reentrantDetermineWidth;
+	gboolean	reentrantDetermineHeight;
 };
 
 /* Properties */
@@ -172,9 +175,19 @@ static void _xfdashboard_scaled_table_layout_get_preferred_width(ClutterLayoutMa
 	/* Update number of rows and columns needed for layout */
 	_xfdashboard_scaled_table_layout_update_rows_and_columns(XFDASHBOARD_SCALED_TABLE_LAYOUT(self), inContainer);
 
-	/* Get size of parent if this child is parented */
+	/* Get size of parent if this child is parented and if it is not reentrant */
 	parent=clutter_actor_get_parent(CLUTTER_ACTOR(inContainer));
-	if(parent) clutter_actor_get_size(CLUTTER_ACTOR(parent), &maxNaturalWidth, NULL);
+	if(parent && !priv->reentrantDetermineWidth)
+	{
+		/* Prevent getting size of parent (reentrance) */
+		priv->reentrantDetermineWidth=TRUE;
+
+		/* Get size of parent */
+		clutter_actor_get_size(CLUTTER_ACTOR(parent), &maxNaturalWidth, NULL);
+
+		/* Allow getting size of parent again */
+		priv->reentrantDetermineWidth=FALSE;
+	}
 
 	/* Calculate width */
 	if(priv->columns>0)
@@ -210,9 +223,19 @@ static void _xfdashboard_scaled_table_layout_get_preferred_height(ClutterLayoutM
 	/* Update number of rows and columns needed for layout */
 	_xfdashboard_scaled_table_layout_update_rows_and_columns(XFDASHBOARD_SCALED_TABLE_LAYOUT(self), inContainer);
 
-	/* Get size of parent if this child is parented */
+	/* Get size of parent if this child is parented and if it is not reentrant */
 	parent=clutter_actor_get_parent(CLUTTER_ACTOR(inContainer));
-	if(parent) clutter_actor_get_size(CLUTTER_ACTOR(parent), NULL, &maxNaturalHeight);
+	if(parent && !priv->reentrantDetermineHeight)
+	{
+		/* Prevent getting size of parent (reentrance) */
+		priv->reentrantDetermineHeight=TRUE;
+
+		/* Get size of parent */
+		clutter_actor_get_size(CLUTTER_ACTOR(parent), NULL, &maxNaturalHeight);
+
+		/* Allow getting size of parent again */
+		priv->reentrantDetermineHeight=FALSE;
+	}
 
 	/* Calculate height */
 	if(priv->rows>0)
@@ -537,6 +560,9 @@ static void xfdashboard_scaled_table_layout_init(XfdashboardScaledTableLayout *s
 	priv->rows=0;
 	priv->columns=0;
 	priv->numberChildren=0;
+
+	priv->reentrantDetermineWidth=FALSE;
+	priv->reentrantDetermineHeight=FALSE;
 }
 
 /* IMPLEMENTATION: Public API */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.