changeset 30070:5b6bfea1c93d

merge of '06a717cbd5d5cae94a3019a5a3a18bbd08b01e5f' and '354b926b5ca689a477eb0dfa578a1dd7bd4c1b1e'
author Paul Aurich <paul@darkrain42.org>
date Fri, 02 Apr 2010 02:25:49 +0000
parents 1b1d52527705 (diff) 396340abea17 (current diff)
children 70e67a2fa0ca 60af53dd42d5
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/finch/libgnt/gntbox.c	Fri Apr 02 02:25:23 2010 +0000
+++ b/finch/libgnt/gntbox.c	Fri Apr 02 02:25:49 2010 +0000
@@ -422,7 +422,7 @@
 
 		gnt_widget_get_size(wid, &w, &h);
 
-		if (wid != last && !child && gnt_widget_confirm_size(wid, w - wchange, h - hchange)) {
+		if (wid != last && !child && w > 0 && h > 0 && gnt_widget_confirm_size(wid, w - wchange, h - hchange)) {
 			child = wid;
 			break;
 		}
@@ -442,6 +442,9 @@
 			GntWidget *wid = iter->data;
 			int w, h;
 
+			if (wid == child)
+				continue;
+
 			gnt_widget_get_size(wid, &w, &h);
 			if (box->vertical) {
 				/* For a vertical box, if we are changing the width, make sure the widgets