1. Ascynchronous layout!

soheil_h_y · soheil_h_y · commit ec55fee38d52 · 2006-07-15T08:08:24.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
@@ -1009,6 +1009,7 @@ void updateLayout (boolean resize, boolean all) {
 		state &= ~(LAYOUT_NEEDED | LAYOUT_CHANGED);
 		if (resize) setResizeChildren (false);
 //		layout.layout (this, changed);
+		this.waintingForLayout = true;
 		display.sendMessage(new MESSAGE(this, MESSAGE.CONTROL_LAYOUT, new boolean[] {resize, all}));
 		if (resize) setResizeChildren (true);
 	}
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
@@ -12,13 +12,10 @@
 package org.eclipse.swt.widgets;
 
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
-import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Device;
@@ -2933,7 +2930,7 @@ public boolean readAndDispatch () {
 		public void run() {
 //			System.out.println("I'm entering the run");
 //			System.out.println("msg " + Display.this.msgs);
-			List layoutQueue = new ArrayList();
+//			List layoutQueue = new ArrayList();
 			MESSAGE[] msgs = Display.this.msgs;
 			if (msgs.length != 0) {
 				System.out.println("msgs.legnth" + msgs.length);
@@ -2954,10 +2951,9 @@ public void run() {
 					}
 					
 					if(m1.type == MESSAGE.CONTROL_LAYOUT){
-						if(layoutQueue.contains(m1.control.parent)){
+						if(m1.control.parent != null && m1.control.parent.waintingForLayout){
 							msgs[i] = null;
 						}
-						layoutQueue.add(m1);
 					}
 					
 				}
@@ -2968,6 +2964,7 @@ public void run() {
 					MESSAGE m = msgs[i];
 					msgs[i] = null;
 					if (m != null && m.type == MESSAGE.CONTROL_LAYOUT) {
+						m.control.waintingForLayout = false;
 						if (!m.control.isVisible()) { continue; }
 						Date d = new Date();
 						Composite c = (Composite) m.control;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Widget.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Widget.java
@@ -71,7 +71,7 @@ public abstract class Widget {
 	boolean dragStatus;
 	long hoverTime;
 	int hoverTimerID;
-	
+	boolean waintingForLayout;
 	boolean[] hookedStatus;
 
 	/* Global state flags */
@@ -142,6 +142,7 @@ public Widget (Widget parent, int style) {
 	checkParent (parent);
 	this.style = style;
 	display = parent.display;
+	waintingForLayout = false;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1009,6 +1009,7 @@ void updateLayout (boolean resize, boolean all) {`
`1009`	`1009`	`state &= ~(LAYOUT_NEEDED \| LAYOUT_CHANGED);`
`1010`	`1010`	`if (resize) setResizeChildren (false);`
`1011`	`1011`	`// layout.layout (this, changed);`
	`1012`	`+ this.waintingForLayout = true;`
`1012`	`1013`	`display.sendMessage(new MESSAGE(this, MESSAGE.CONTROL_LAYOUT, new boolean[] {resize, all}));`
`1013`	`1014`	`if (resize) setResizeChildren (true);`
`1014`	`1015`	`}`