gtkhtml r8893 - trunk/gtkhtml

[mcrha svn gnome org]

Author: mcrha
Date: Mon Jul 14 08:32:23 2008
New Revision: 8893
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8893&view=rev

Log:
2008-07-14  Milan Crha  <mcrha redhat com>

	** Fix for bug #540929

	* htmlframeset.c: (calc_dimension): Stop expanding columns as soon
	as there were no columns expanded during the cycle.



Modified:
   trunk/gtkhtml/ChangeLog
   trunk/gtkhtml/htmlframeset.c

Modified: trunk/gtkhtml/htmlframeset.c
==============================================================================
--- trunk/gtkhtml/htmlframeset.c	(original)
+++ trunk/gtkhtml/htmlframeset.c	Mon Jul 14 08:32:23 2008
@@ -94,6 +94,7 @@
 	int adj;
 	int remain;
 	int num_frac = 0;
+	gboolean changed;
 
 	g_return_if_fail (dim != NULL && span != NULL);
 
@@ -128,16 +129,22 @@
 	if (remain < 0)
 		adj = -1;
 
+	changed = FALSE;
 	i = 0;
 	while (remain != 0) {
 		if (span[i] > 0) {
 			span[i] += adj;
 			remain -= adj;
+			changed = TRUE;
 		}
 
 		i++;
-		if (i >= dim->len)
+		if (i >= dim->len) {
 			i = 0;
+			if (!changed)
+				break;
+			changed = FALSE;
+		}
 	}
 }