Attachment 184393 Details for Bug 118659 – patch to make empty composites with a layout be 0 x 0

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch to make empty composites with a layout be 0 x 0

patch.txt (text/plain), 6.15 KB, created by Carolyn MacLeod

on 2010-12-02 15:10:51 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Carolyn MacLeod

Created: 2010-12-02 15:10:51 EST

Size: 6.15 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java,v
>retrieving revision 1.107
>diff -u -r1.107 Composite.java
>--- Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java	18 Oct 2010 16:21:08 -0000	1.107
>+++ Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java	2 Dec 2010 16:32:05 -0000
>@@ -201,9 +201,9 @@
> 		}
> 	} 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);
>Index: Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java,v
>retrieving revision 1.90
>diff -u -r1.90 Composite.java
>--- Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java	18 Oct 2010 16:21:08 -0000	1.90
>+++ Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java	2 Dec 2010 16:32:05 -0000
>@@ -240,9 +240,9 @@
> 		}
> 	} 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);
>Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java,v
>retrieving revision 1.146
>diff -u -r1.146 Composite.java
>--- Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java	18 Oct 2010 16:21:08 -0000	1.146
>+++ Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java	2 Dec 2010 16:32:06 -0000
>@@ -224,9 +224,9 @@
> 		}
> 	} 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);
>Index: Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java,v
>retrieving revision 1.134
>diff -u -r1.134 Composite.java
>--- Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java	18 Oct 2010 16:21:08 -0000	1.134
>+++ Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java	2 Dec 2010 16:32:06 -0000
>@@ -157,9 +157,9 @@
> 		}
> 	} 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);
>Index: Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java,v
>retrieving revision 1.82
>diff -u -r1.82 Composite.java
>--- Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java	18 Oct 2010 16:21:08 -0000	1.82
>+++ Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java	2 Dec 2010 16:32:06 -0000
>@@ -223,9 +223,9 @@
> 		}
> 	} else {
> 		size = minimumSize ();
>+		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);
>Index: Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java,v
>retrieving revision 1.211
>diff -u -r1.211 Composite.java
>--- Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java	21 Oct 2010 15:03:16 -0000	1.211
>+++ Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java	2 Dec 2010 16:32:06 -0000
>@@ -236,9 +236,9 @@
> 		}
> 	} 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);
>Index: Eclipse SWT/wpf/org/eclipse/swt/widgets/Composite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Composite.java,v
>retrieving revision 1.28
>diff -u -r1.28 Composite.java
>--- Eclipse SWT/wpf/org/eclipse/swt/widgets/Composite.java	18 Oct 2010 16:21:08 -0000	1.28
>+++ Eclipse SWT/wpf/org/eclipse/swt/widgets/Composite.java	2 Dec 2010 16:32:06 -0000
>@@ -255,9 +255,9 @@
> 		}
> 	} 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);

Actions: View | Diff

Attachments on bug 118659: 184393