changeset 29663:1b1d52527705

merge of '4a470af3f892b6e0337b0f9bb37a216c7370e8fa' and '782e804fc8a8d63fd48996df3e691de231e1facc'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 02 Apr 2010 02:17:29 +0000
parents b0f8dcab7b43 (current diff) 5d3f64f8e7b5 (diff)
children 5b6bfea1c93d
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/finch/libgnt/gntbox.c	Thu Apr 01 18:34:34 2010 +0000
+++ b/finch/libgnt/gntbox.c	Fri Apr 02 02:17:29 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