From 655b61d50c03a4c7d58be015595f0114fafdc1f8 Mon Sep 17 00:00:00 2001
From: Carolyn MacLeod <carolyn>
Date: Thu, 2 Dec 2010 19:18:08 +0000
Subject: Bug 118659 - [Layout] Issues with algorithm in GridLayout.layout and
 Composite.computeSize

---
 .../Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets')

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index 59fb2b5976..35f3c5c1b2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java	
@@ -224,9 +224,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 		}
 	} else {
 		size = minimumSize (wHint, hHint, changed);
+		if (size.x == 0) size.x = DEFAULT_WIDTH;
+		if (size.y == 0) size.y = DEFAULT_HEIGHT;
 	}
-	if (size.x == 0) size.x = DEFAULT_WIDTH;
-	if (size.y == 0) size.y = DEFAULT_HEIGHT;
 	if (wHint != SWT.DEFAULT) size.x = wHint;
 	if (hHint != SWT.DEFAULT) size.y = hHint;
 	Rectangle trim = computeTrim (0, 0, size.x, size.y);
-- 
cgit