Fixed bugs that ScrollBar does not behavior correctly and its layout is not positioned as expected.

zhourenjian · zhourenjian · commit 85ed253edef9 · 2007-09-25T18:01:10.000Z
Improve Menu's border.
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
@@ -109,7 +109,7 @@ public Composite (Composite parent, int style) {
 	/* 
 	 * TODO: search the DOM and filter out the children
 	 */
-	int count = children.length; //handle.childNodes.length;
+	int count = children != null ? children.length : 0; //handle.childNodes.length;
 	//Control [] children = new Control [0];
 	int index = 0;
 	Control [] newChildren = new Control [0];
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.css b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.css
@@ -1,6 +1,8 @@
 .menu-default {
 	position:absolute;
-	border:1px outset white;
+	border-width:2px;
+	border-style:groove solid solid groove;
+	border-color:white gray gray white;
 	background-color:menu;
 	font-family:Tahoma, Arial, sans-serif;
 	font-size:8pt;
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
@@ -253,6 +253,7 @@ protected void createVerticalScrollBar(Element parent, int sbOuterHeight, int sb
 	style.padding = "0";
 	style.borderStyle = "none";
 	style.overflow = "hidden";
+	style.zIndex = "1";
 	int sbWidth = OS.getScrollBarWidth();
 	style.width = sbWidth + "px";
 	style.height = sbOuterHeight + "px";
@@ -286,6 +287,7 @@ protected void createHorizontalScrollBar(Element parent, int sbOuterWidth, int s
 	style.padding = "0";
 	style.borderStyle = "none";
 	style.overflow = "hidden";
+	style.zIndex = "1";
 	style.width = sbOuterWidth + "px";
 	int sbHeight = OS.getScrollBarHeight();
 	style.height = sbHeight + "px";
@@ -776,6 +778,7 @@ public void setEnabled (boolean enabled) {
 public void setIncrement (int value) {
 	checkWidget();
 	if (value < 1) return;
+	if (increment == value) return;
 	increment = value;
 }
 
@@ -805,7 +808,8 @@ public void setMaximum (int value) {
 	info.nMax = value;
 	SetScrollInfo (hwnd, type, info, true);
 	*/
-	if (value < minimum) return ;
+	if (value < minimum) return;
+	if (maximum == value) return;
 	maximum = value;
 	if (selection > maximum) {
 		selection = maximum;
@@ -840,6 +844,7 @@ public void setMinimum (int value) {
 	SetScrollInfo (hwnd, type, info, true);
 	*/
 	if (value > maximum) return;
+	if (minimum == value) return;
 	minimum = value;
 	if (selection < minimum) {
 		selection = minimum;
@@ -954,6 +959,7 @@ public void setSelection (int selection) {
 	SetScrollInfo (hwnd, type, info, true);
 	*/
 	if (selection < 0) return;
+	if (this.selection == selection) return;
 	if (selection < minimum) {
 		this.selection = minimum; 
 	} else if (selection > maximum - thumb) {
@@ -991,6 +997,7 @@ public void setThumb (int value) {
 	if (info.nPage != 0) info.nPage++;
 	SetScrollInfo (hwnd, type, info, true);
 	*/
+	if (thumb == value) return;
 	thumb = value;
 	updateScrollBar();
 }
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Scrollable.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Scrollable.java
@@ -189,6 +189,12 @@ public Rectangle getClientArea () {
 //	}
 	w = width;
 	h = height;
+	if (verticalBar != null) { //if ((style & SWT.V_SCROLL) != 0) {
+		w -= OS.getScrollBarWidth();
+	}
+	if (horizontalBar != null) { //if ((style & SWT.H_SCROLL) != 0) {
+		h -= OS.getScrollBarHeight();
+	}
 	if (w < 0) {
 		w = 64;
 	}
