1. CheckBox enhancement for FF.

soheil_h_y · soheil_h_y · commit b992dae89b43 · 2007-04-07T13:21:51.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java
@@ -1274,7 +1274,7 @@ public void run() {
 				HTMLEvent e = (HTMLEvent) getEvent();
 				if ((style & SWT.CHECK) != 0) {
 					// Still buggy on check button with image
-					if (e.srcElement != btnHandle) {
+					if (e.srcElement != btnHandle && e.target != btnHandle) {
 						setSelection (!getSelection ());
 					}
 				} else {
@@ -1307,6 +1307,9 @@ public void run() {
 	handle.onclick = handle.ondblclick = eventHandler;
 	if ((style & (SWT.RADIO | SWT.CHECK)) != 0) {
 		btnText.onclick = eventHandler;
+	}
+	if((style & SWT.CHECK) != 0){
+		
 	}
 	handle.onkeydown = new RunnableCompatibility() {
 		public void run() {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Control.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Control.java
@@ -71,7 +71,7 @@ public abstract class Control extends Widget implements Drawable {
 	protected int height;
 	protected int width;
 	//private int lastLeft, lastTop, lastHeight, lastWidth; 
-
+	boolean boundsSet = false;
 /**
  * Prevents uninitialized instances from being created outside the package.
  * @j2sIgnore
@@ -2076,6 +2076,7 @@ void setBounds (int x, int y, int width, int height, int flags, boolean defer) {
 	/**
 	 * A patch to send bounds to support mirroring features like what Windows have.
 	 */
+	boundsSet = true;
 	int tempX = x;
 	if(parent != null){
 		if((parent.style & SWT.RIGHT_TO_LEFT) != 0){
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java
@@ -657,7 +657,7 @@ public void run() {
 				if ((defaultButton.style & (SWT.CHECK | SWT.TOGGLE)) != 0) {
 					
 					if ((defaultButton.style & SWT.CHECK) != 0) {
-						if (e.srcElement != defaultButton.btnHandle) {
+						if (e.srcElement != defaultButton.btnHandle  && e.target != defaultButton.btnHandle) {
 							defaultButton.setSelection (!defaultButton.getSelection ());
 						}
 					} else {
@@ -681,6 +681,13 @@ public void run() {
 }
 
 void nextWindowLocation(int wHint, int hHint) {
+	/*
+	 * if the user has set the bounds of the shell we should not override it!
+	 */
+	if(boundsSet) {
+		return;
+	}
+	
 	int delta = OS.getStringPlainHeight("A") + 4 + 6 + 1;
 	if (window.defaultWindowLeft == null) {
 		window.defaultWindowLeft = "64";
@@ -1708,6 +1715,7 @@ public void setMaximized (boolean maximized) {
 	Monitor monitor = getMonitor();
 	boolean updateBody = (monitor.handle == document.body); // update with current body client area
 	if (maximized) {
+		
 		if (updateBody) {
 			lastBodyScrollLeft = node.scrollLeft;
 			lastBodyScrollTop = node.scrollTop;
@@ -1755,10 +1763,13 @@ public void setMaximized (boolean maximized) {
 			 * @j2sNative
 			 * isOptMaximized = window["ShellManager"] != null; 
 			 */ {}
+			 
+			
 			if (!isOptMaximized) {
 				setBounds(computeTrim(0, 0, width, height - titleHeight));
 			} else {
-				setBounds(computeTrim(0, -titleHeight, width, height));
+				Rectangle trim = computeTrim(0, -titleHeight, width, height);
+				setBounds(trim.x, trim.y, trim.width, trim.height);
 				toUpdateMax = true;
 			}
 		}
@@ -2401,6 +2412,7 @@ protected boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y
 	el.style.top = Y + "px";
 	el.style.width = (cx > 0 ? cx : 0) + "px";
 	el.style.height = (cy > 0 ? cy : 0) + "px";
+	
 	return true;
 //	return super.SetWindowPos(hWnd, hWndInsertAfter, X, Y, cx, cy, uFlags);
 }
