Change the type of Element.style.zIndex into int type, so the codes should be a lot clearer. And it is considered as compatible with IE/Firefox/WebKit/Opera

zhourenjian · zhourenjian · commit 39c70c718198 · 2009-03-11T14:21:43.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/dnd/ShellFrameDND.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/dnd/ShellFrameDND.java
@@ -55,7 +55,7 @@ public boolean dragBegan(DragEvent e) {
 			this.frame.style.backgroundColor = "menu";
 			this.frame.style.left = this.sourceX + "px";
 			this.frame.style.top = this.sourceY + "px";
-			this.frame.style.zIndex = "" + (Integer.parseInt(window.currentTopZIndex) + 100);
+			this.frame.style.zIndex = window.currentTopZIndex + 100;
 			document.body.appendChild (this.frame);
 			boolean existedTitleBar = false;
 			Element[] els = e.sourceElement.getElementsByTagName("DIV");
@@ -325,7 +325,7 @@ public boolean dragEnded(DragEvent e) {
 //		shell.style.top = y + "px";
 //		shell.style.width = width + "px";
 //		shell.style.height = height + "px";
-		shell.style.zIndex = window.currentTopZIndex = "" + (Integer.parseInt(window.currentTopZIndex) + 2);
+		shell.style.zIndex = window.currentTopZIndex = window.currentTopZIndex + 2;
 		
 //		ShellFrameDND.fixShellHeight (e.sourceElement);
 //		ShellFrameDND.fixShellWidth (e.sourceElement);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/CSSStyle.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/CSSStyle.java
@@ -17,7 +17,7 @@ public class CSSStyle {
 	public String overflow;
 	public String opacity;
 	
-	public String zIndex;
+	public int zIndex;
 	public String textIndent;
 	public String textDecoration;
 	public String textAlign;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/window.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/window.java
@@ -5,7 +5,7 @@ public class window {
 	public static String defaultWindowTop;
 	public static String defaultWindowWidth;
 	public static String defaultWindowHeight;
-	public static String currentTopZIndex;
+	public static int currentTopZIndex;
 	
 	public static int clientWidth;
 	public static int clientHeight;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Combo.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Combo.java
@@ -766,9 +766,9 @@ void show(){
 		//h -= 2;
 	}
 	this.selectShown = true;
-	window.currentTopZIndex = "" + (Integer.parseInt(window.currentTopZIndex) + 1);
+	window.currentTopZIndex = window.currentTopZIndex + 1;
 	// related bug: http://groups.google.com/group/java2script/browse_thread/thread/8085561fcf953fc?hl=en
-	selectInput.style.zIndex = "" + (Integer.parseInt(window.currentTopZIndex) + 4); //sgurin
+	selectInput.style.zIndex = window.currentTopZIndex + 4; //sgurin
 	try {
 		handle.removeChild(selectInput);
 		document.body.appendChild(selectInput);
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
@@ -238,12 +238,8 @@ void bringToTop (boolean parentShell, boolean childShells) {
 //		if (style.display == "none") {
 //			style.display = "block";
 //		}
-		if (window.currentTopZIndex == null) {
-			window.currentTopZIndex = "1000";
-		}
 		if (style.zIndex != window.currentTopZIndex) {
-			style.zIndex = window.currentTopZIndex = ""
-					+ (Integer.parseInt(window.currentTopZIndex) + 2);
+			style.zIndex = window.currentTopZIndex = window.currentTopZIndex + 2;
 		}
 		if ((style.width == null || style.width.length() == 0) 
 				&& (style.height == null || style.height.length() == 0)){
@@ -275,8 +271,7 @@ void bringToTop (boolean parentShell, boolean childShells) {
 					&& (control instanceof Shell)/* && control.isVisible()*/) {
 				style = control.handle.style;
 				if (style != null && style.zIndex != window.currentTopZIndex) {
-					style.zIndex = window.currentTopZIndex = ""
-							+ (Integer.parseInt(window.currentTopZIndex) + 2);
+					style.zIndex = window.currentTopZIndex = window.currentTopZIndex + 2;
 				}
 			}
 		}
@@ -296,7 +291,7 @@ void bringToTop (boolean parentShell, boolean childShells) {
 	}
 	
 	if (modalHandle != null) {
-		modalHandle.style.zIndex = "" + (Integer.parseInt("" + handle.style.zIndex) - 1);
+		modalHandle.style.zIndex = handle.style.zIndex - 1;
 	}
 }
 
@@ -825,7 +820,7 @@ void nextWindowLocation(int wHint, int hHint) {
 void addModalLayer() {
 	modalHandle = document.createElement ("DIV");
 	modalHandle.className = "shell-modal-block";
-	modalHandle.style.zIndex = "" + (Integer.parseInt("" + handle.style.zIndex) - 1);
+	modalHandle.style.zIndex = handle.style.zIndex - 1;
 	getMonitor().handle.insertBefore(modalHandle, handle);
 }
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/DesktopItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/DesktopItem.java
@@ -21,7 +21,7 @@ public abstract class DesktopItem {
 
 	boolean mouseAlreadyMoved;
 	
-	String layerZIndex = null;
+	int layerZIndex = -1;
 
 	private Runnable leaving;
 
@@ -53,7 +53,7 @@ public void run() {
 
 	public abstract void initialize();
 	
-	public abstract void bringToTop(String zIndex);
+	public abstract void bringToTop(int zIndex);
 	
 	public abstract void updateLayout();
 	
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
@@ -159,6 +159,7 @@
 				FontSizeSystem.monitorFontSize (true)
 			}, 250);
 };
+window.currentTopZIndex = 1000;
  */
 
 public class Display extends Device {
@@ -4554,15 +4555,10 @@ static int wcsToMbcs (char ch) {
 }
 */
 
-static String getNextZIndex(boolean increase) {
-	String zIndex = "";
-	if (window.currentTopZIndex == null) {
-		zIndex = "1000";
-	} else {
-		zIndex = (Integer.parseInt(window.currentTopZIndex) + 1) + "";
-		if (increase) {
-			window.currentTopZIndex = zIndex;
-		}
+static int getNextZIndex(boolean increase) {
+	int zIndex = window.currentTopZIndex + 1;
+	if (increase) {
+		window.currentTopZIndex = zIndex;
 	}
 	return zIndex;
 }
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MaximizedTitle.css b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MaximizedTitle.css
@@ -11,6 +11,8 @@
 	height:1.6em;
 	min-height:24px;
 	_height:1.7em;*/
+	width:320px;
+	z-index:6174;
 	text-align:left;
 	font-size:0;
 	margin:0;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MaximizedTitle.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MaximizedTitle.java
@@ -84,8 +84,6 @@ public void initialize() {
 		tbc.className = "shell-manager-topbar-container";
 		document.body.appendChild(tbc);
 		tbc.style.display = "none";
-		tbc.style.width = "320px";
-		tbc.style.zIndex = "3456";
 		this.handle = tbc;
 		
 		boolean supportShadow = false;
@@ -170,8 +168,7 @@ public boolean handleMouseMove(long now, int x, int y, boolean ctrlKey) {
 		return false;
 	}
 
-	public void bringToTop(String index) {
-		// TODO Auto-generated method stub
+	public void bringToTop(int index) {
 		
 	}
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.java
@@ -221,7 +221,7 @@ void _setVisible (boolean visible) {
 	if (visible) {
 		//style.width = "200px";
 		Rectangle clientArea = getDisplay().getPrimaryMonitor().getClientArea();
-		style.zIndex = "1" + window.currentTopZIndex;
+		style.zIndex = window.currentTopZIndex + 1000;
 		style.display = "block";
 		handle.style.height = "";
 		int height = OS.getContainerHeight(handle);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MenuItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MenuItem.java
@@ -211,7 +211,7 @@ public void run() {
 				/**
 				 * @j2sNative
 				 * el.onmouseout();
-				 */ {}
+				 */ { el.toString(); }
 			}
 			p.currentIndex = indexOf;
 			if ((parent.style & SWT.BAR) != 0) {
@@ -342,7 +342,7 @@ public void run() {
 			Element btn = parent.btnFocus;
 			/**
 			 * @j2sNative btn.onblur();
-			 */ {}
+			 */ { btn.toString(); }
 		}
 	};
 }
@@ -1384,7 +1384,7 @@ void showSubMenu() {
 	//showMenu(rect.x, rect.y);
 	menu.handle.style.left = rect.x + "px";
 	menu.handle.style.top = rect.y + "px";
-	menu.handle.style.zIndex = "1" + window.currentTopZIndex;
+	menu.handle.style.zIndex = window.currentTopZIndex + 1000;
 	menu.handle.style.display = "block";
 	OS.SetFocus(menu.btnFocus); // menu.btnFocus.focus();
 }
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/NotificationCorner.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/NotificationCorner.java
@@ -97,7 +97,7 @@ public void initialize() {
 			public void run() {
 				if (display != null && !display.isDisposed()) {
 					if (display.trayCorner != null) {
-						display.trayCorner.bringToTop(null);
+						display.trayCorner.bringToTop(-1);
 					}
 					Shell shell = display.getActiveShell();
 					if (shell != null) {
@@ -129,9 +129,9 @@ public void run() {
 					if (isAutoHide) {
 						setMinimized(false);
 					}
-					String zIndex = Display.getNextZIndex(false);
-					if ("" + handle.style.zIndex != zIndex) {
-						layerZIndex = "" + handle.style.zIndex;
+					int zIndex = Display.getNextZIndex(false);
+					if (handle.style.zIndex != zIndex) {
+						layerZIndex = handle.style.zIndex;
 						bringToTop(zIndex);
 					}
 				}
@@ -152,7 +152,7 @@ public void run() {
 
 						}, 500);
 					}
-					bringToTop(null);
+					bringToTop(-1);
 				}
 			
 			};
@@ -169,7 +169,7 @@ public void run() {
 					if (isJustUpdated) {
 						return;
 					}
-					bringToTop(null);
+					bringToTop(-1);
 				}
 			
 			};
@@ -203,9 +203,9 @@ public void handleApproaching() {
 		if (handle == null) {
 			return;
 		}
-		String zIndex = Display.getNextZIndex(false);
-		if ("" + handle.style.zIndex != zIndex) {
-			layerZIndex = "" + handle.style.zIndex;
+		int zIndex = Display.getNextZIndex(false);
+		if (handle.style.zIndex != zIndex) {
+			layerZIndex = handle.style.zIndex;
 			if (!isAutoHide) {
 				setMinimized(false);
 			}
@@ -217,9 +217,9 @@ public void handleLeaving() {
 		if (handle == null) {
 			return;
 		}
-		if (layerZIndex != null) {
+		if (layerZIndex != -1) {
 			bringToTop(layerZIndex);
-			layerZIndex = null;
+			layerZIndex = -1;
 		}
 		if (isAutoHide) {
 			setMinimized(true);
@@ -269,7 +269,12 @@ public boolean handleMouseMove(long now, int x, int y, boolean ctrlKey) {
 		return false;
 	}
 
-	void setZIndex(String zIdx) {
+	void setZIndex(int zIdx) {
+		if (zIdx == -1 && !OS.isIE)
+		/**
+		 * @j2sNative
+		 * zIdx = "";
+		 */{ }
 		if (isMinimized()) {
 			minimizedEl.style.zIndex = zIdx;
 			return;
@@ -342,13 +347,13 @@ int getRange() {
 		return tray.cellLines * 36;
 	}
 
-	public void bringToTop(String zIdx) {
+	public void bringToTop(int zIdx) {
 		Tray tray = Display.getTray();
 		if (tray == null) {
 			return;
 		}
-		String zIndex = "";
-		if (zIdx == null) {
+		int zIndex = -1;
+		if (zIdx == -1) {
 			zIndex = Display.getNextZIndex(true);
 			if (Display.getTopMaximizedShell() == null) {
 				layerZIndex = zIndex;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/QuickLaunch.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/QuickLaunch.java
@@ -75,10 +75,10 @@ public void run() {
 				if (isAutoHide) {
 					setMinimized(false);
 				}
-				String zIndex = Display.getNextZIndex(false);
-				if ("" + handle.style.zIndex != zIndex) {
-					layerZIndex = "" + handle.style.zIndex;
-					bringToTop(zIndex);
+				int zIndex = Display.getNextZIndex(false);
+				if (handle.style.zIndex != zIndex) {
+					layerZIndex = handle.style.zIndex;
+					bringToTop(-1);
 				}
 			}
 		
@@ -96,7 +96,7 @@ public void run() {
 					
 					}, 500);
 				}
-				bringToTop(null);
+				bringToTop(-1);
 			}
 		
 		};
@@ -111,7 +111,7 @@ public void run() {
 				if (isJustUpdated) {
 					return;
 				}
-				bringToTop(null);
+				bringToTop(-1);
 			}
 		
 		};
@@ -212,19 +212,24 @@ public void setShortcutsVisible(boolean visible) {
 			itemDiv.style.display = visible ? "" : "none";
 		}
 	}
-	public void bringToTop(String zIdx) {
+	public void bringToTop(int zIdx) {
 		if (this.shortcutCount <= 0) {
 			return;
 		}
-		String zIndex = "";
-		if (zIdx == null) {
+		int zIndex = -1;
+		if (zIdx == -1) {
 			zIndex = Display.getNextZIndex(true);
 			if (Display.getTopMaximizedShell() == null) {
 				this.layerZIndex = zIndex;
 			}
 		} else {
 			zIndex = zIdx;
 		}
+		if (zIndex == -1 && !OS.isIE)
+		/**
+		 * @j2sNative
+		 * zIndex = "";
+		 */{ }
 		this.handle.style.zIndex = zIndex;
 		for (int i = 0; i < this.shortcutCount; i++) {
 			Element itemDiv = this.shortcutItems[i];
@@ -315,7 +320,7 @@ public Element addShortcut(String name, String icon, Object clickFun) {
 
 		this.shortcutItems[this.shortcutCount] = itemDiv;
 		this.shortcutCount++;
-		this.bringToTop(null);
+		this.bringToTop(-1);
 		this.updateLayout();
 		setMinimized(false);
 		updateLastModified();
@@ -357,17 +362,17 @@ public boolean isLeaving(long now, int x, int y, boolean ctrlKey) {
 	}
 
 	public void handleApproaching() {
-		String zIndex = Display.getNextZIndex(false);
-		if ("" + handle.style.zIndex != zIndex) {
-			layerZIndex = "" + handle.style.zIndex;
+		int zIndex = Display.getNextZIndex(false);
+		if (handle.style.zIndex != zIndex) {
+			layerZIndex = handle.style.zIndex;
 			bringToTop(zIndex);
 		}
 	}
 
 	public void handleLeaving() {
-		if (layerZIndex != null) {
+		if (layerZIndex != -1) {
 			bringToTop(layerZIndex);
-			layerZIndex = null;
+			layerZIndex = -1;
 		}
 		if (isAutoHide) {
 			setMinimized(true);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ScrollBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ScrollBar.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TabFolder.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TabFolder.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Tray.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Tray.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TrayItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TrayItem.java

Original file line number	Diff line number	Diff line change
`@@ -238,12 +238,8 @@ void bringToTop (boolean parentShell, boolean childShells) {`
`238`	`238`	`// if (style.display == "none") {`
`239`	`239`	`// style.display = "block";`
`240`	`240`	`// }`
`241`		`- if (window.currentTopZIndex == null) {`
`242`		`- window.currentTopZIndex = "1000";`
`243`		`- }`
`244`	`241`	`if (style.zIndex != window.currentTopZIndex) {`
`245`		`- style.zIndex = window.currentTopZIndex = ""`
`246`		`- + (Integer.parseInt(window.currentTopZIndex) + 2);`
	`242`	`+ style.zIndex = window.currentTopZIndex = window.currentTopZIndex + 2;`
`247`	`243`	`}`
`248`	`244`	`if ((style.width == null \|\| style.width.length() == 0)`
`249`	`245`	`&& (style.height == null \|\| style.height.length() == 0)){`
`@@ -275,8 +271,7 @@ void bringToTop (boolean parentShell, boolean childShells) {`
`275`	`271`	`&& (control instanceof Shell)/* && control.isVisible()*/) {`
`276`	`272`	`style = control.handle.style;`
`277`	`273`	`if (style != null && style.zIndex != window.currentTopZIndex) {`
`278`		`- style.zIndex = window.currentTopZIndex = ""`
`279`		`- + (Integer.parseInt(window.currentTopZIndex) + 2);`
	`274`	`+ style.zIndex = window.currentTopZIndex = window.currentTopZIndex + 2;`
`280`	`275`	`}`
`281`	`276`	`}`
`282`	`277`	`}`
`@@ -296,7 +291,7 @@ void bringToTop (boolean parentShell, boolean childShells) {`
`296`	`291`	`}`
`297`	`292`
`298`	`293`	`if (modalHandle != null) {`
`299`		`- modalHandle.style.zIndex = "" + (Integer.parseInt("" + handle.style.zIndex) - 1);`
	`294`	`+ modalHandle.style.zIndex = handle.style.zIndex - 1;`
`300`	`295`	`}`
`301`	`296`	`}`
`302`	`297`
`@@ -825,7 +820,7 @@ void nextWindowLocation(int wHint, int hHint) {`
`825`	`820`	`void addModalLayer() {`
`826`	`821`	`modalHandle = document.createElement ("DIV");`
`827`	`822`	`modalHandle.className = "shell-modal-block";`
`828`		`- modalHandle.style.zIndex = "" + (Integer.parseInt("" + handle.style.zIndex) - 1);`
	`823`	`+ modalHandle.style.zIndex = handle.style.zIndex - 1;`
`829`	`824`	`getMonitor().handle.insertBefore(modalHandle, handle);`
`830`	`825`	`}`
`831`	`826`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,6 @@ public void initialize() {`
`84`	`84`	`tbc.className = "shell-manager-topbar-container";`
`85`	`85`	`document.body.appendChild(tbc);`
`86`	`86`	`tbc.style.display = "none";`
`87`		`- tbc.style.width = "320px";`
`88`		`- tbc.style.zIndex = "3456";`
`89`	`87`	`this.handle = tbc;`
`90`	`88`
`91`	`89`	`boolean supportShadow = false;`
`@@ -170,8 +168,7 @@ public boolean handleMouseMove(long now, int x, int y, boolean ctrlKey) {`
`170`	`168`	`return false;`
`171`	`169`	`}`
`172`	`170`
`173`		`- public void bringToTop(String index) {`
`174`		`- // TODO Auto-generated method stub`
	`171`	`+ public void bringToTop(int index) {`
`175`	`172`
`176`	`173`	`}`
`177`	`174`