1. Asyncronous layout bug is solved!

soheil_h_y · soheil_h_y · commit aedff9303909 · 2006-10-16T04:55:38.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Composite.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Composite.java
@@ -54,7 +54,7 @@ public class Composite extends Scrollable {
 	Control [] tabList;
 	int layoutCount = 0;
 //	Control [] children = new Control[0];
-	Control [] children;
+	protected Control [] children;
 	boolean waitingForLayoutWithResize;
 
 /**
@@ -1017,25 +1017,23 @@ protected boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y
 
 void updateLayout (boolean resize, boolean all) {
 	if (isLayoutDeferred ()) return;
-	if ((state & LAYOUT_NEEDED) != 0) {
-		boolean changed = (state & LAYOUT_CHANGED) != 0;
-		state &= ~(LAYOUT_NEEDED | LAYOUT_CHANGED);
+
+	if ((state & LAYOUT_NEEDED) != 0 && !waitingForLayout) {
+//		boolean changed = (state & LAYOUT_CHANGED) != 0;
+//		state &= ~(LAYOUT_NEEDED | LAYOUT_CHANGED);
 //		if (resize) setResizeChildren (false);
 //		layout.layout (this, changed);
 		this.waitingForLayout = true;
 		this.waitingForLayoutWithResize = resize;
 		display.sendMessage(new MESSAGE(this, MESSAGE.CONTROL_LAYOUT, new boolean[] {resize, all}));
-//		if (resize) setResizeChildren (true);
 	}
 	
 	
 	if (all) {
 		Control [] children = _getChildren ();
 		int length = children.length;
 		for (int i=0; i<length; i++) {
-//			children [i].updateLayout (resize, all);
 			if (children[i] instanceof Composite) {
-//				System.out.println("update Layout " + children[i]);
 				display.sendMessage(new MESSAGE(children[i], MESSAGE.CONTROL_LAYOUT, new boolean[] {resize, all}));
 			}
 		}
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java
@@ -3113,6 +3113,7 @@ public void run() {
 						}
 						if(c.layout != null){
 							c.layout.layout (c, (c.state & Composite.LAYOUT_CHANGED) != 0);
+							c.state &= ~(Composite.LAYOUT_NEEDED | Composite.LAYOUT_CHANGED);
 						}
 						if(c.waitingForLayoutWithResize){
 							c.setResizeChildren (true);

Original file line number	Diff line number	Diff line change
`@@ -3113,6 +3113,7 @@ public void run() {`
`3113`	`3113`	`}`
`3114`	`3114`	`if(c.layout != null){`
`3115`	`3115`	`c.layout.layout (c, (c.state & Composite.LAYOUT_CHANGED) != 0);`
	`3116`	`+ c.state &= ~(Composite.LAYOUT_NEEDED \| Composite.LAYOUT_CHANGED);`
`3116`	`3117`	`}`
`3117`	`3118`	`if(c.waitingForLayoutWithResize){`
`3118`	`3119`	`c.setResizeChildren (true);`