Fixed CoolBar's layout bug

zhourenjian · zhourenjian · commit d7a85c49fdc6 · 2008-09-23T14:51:50.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/CoolBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/CoolBar.java
@@ -1491,7 +1491,7 @@ public void setWrapIndices (int [] indices) {
 protected boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags) {
 	int lines = getVerticalLines();
 	int lineNo = 0, itemNo = 0;
-	int bw = getBorderWidth() * 2;
+	//int bw = getBorderWidth() * 2;
 	for (int i = 0; i < items.length; i++) {
 		CoolItem item = items[i];
 		if (items[i].wrap) {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ToolBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ToolBar.java
@@ -1078,7 +1078,12 @@ protected boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y
 		}
 		item.updateItemBounds(w, h);
 	}
-	return super.SetWindowPos(hWnd, hWndInsertAfter, X, Y, cx, cy, uFlags);
+	if (parent instanceof CoolBar) {
+		X = 0;
+		Y = 0;
+	}
+	boolean set = super.SetWindowPos(hWnd, hWndInsertAfter, X, Y, cx, cy, uFlags);
+	return set;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1078,7 +1078,12 @@ protected boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y`
`1078`	`1078`	`}`
`1079`	`1079`	`item.updateItemBounds(w, h);`
`1080`	`1080`	`}`
`1081`		`- return super.SetWindowPos(hWnd, hWndInsertAfter, X, Y, cx, cy, uFlags);`
	`1081`	`+ if (parent instanceof CoolBar) {`
	`1082`	`+ X = 0;`
	`1083`	`+ Y = 0;`
	`1084`	`+ }`
	`1085`	`+ boolean set = super.SetWindowPos(hWnd, hWndInsertAfter, X, Y, cx, cy, uFlags);`
	`1086`	`+ return set;`
`1082`	`1087`	`}`
`1083`	`1088`
`1084`	`1089`	`/*`